Don't need this anymore
Minor refactoring to provide ui messages to the user
oops
Minor changes to theming
Minor fixes