cleaned up back button code in settings
Merge branch 'master' of github.com:michglass/GlassHouse