Home page user-friendliness upgrade.
Merge branch 'master' into staging