More work on the UI, also involved altering some code files to work with the UI setup.