ui changes

changes to the views and other small tweaks
Merge pull request #15 from watshisface/master

ui changes