More UI stuff
Merge pull request #58 from rhokbrisbane/more_ui_stuff

More UI stuff