Code clean up and a bit of UI tweaks.
Merge branch 'master' of github.com:Phill/flying-horse