Ensuring that a theme is selected

The code previously allowe un-selecting.
Minor fixes for theme picker
Merge pull request #524 from adaptlearning/UI-fixes

Ui fixes