Further code style fixups
Issue #4 - further mobile fixes
Merge branch 'master' into gh-pages