tweaks
merge
UI tweaks etc
merge
Merge pull request #61 from marsmith/master

ui tweaks