Updated GUI. Begin refactoring