GUI tab refactoring