Refactoring ui
More ui refactoring. Still a lot of work ahead.