More work on home menu
Revert "More work on home menu"

This reverts commit a2567713e23dcb3e46c4c1e67f49593fc2df328f.