Refactoring GUI. End of day