Minor changes
Merged with changes to _home.php