Refactoring ui

Cleaning up the UI