fixes #37 - full back button hotness
Merge branch 'master' into ui-improv
Merge pull request #39 from pdh/ui-improv

Back button support