Refactores the UI and created some convenience changes. Lots of user-interaction simplification