Refactoring GUI for simplicity