Small pep8 fix
Move the controller code for the UI into its own file
Adjust the unit-tests for the split of the UI controller