Tweaks to front page
Merged changes