Revert "Revert "cleaning up with home page init""

This reverts commit 9387bf2f1e9ec6d15ef0fa5d83b3b51d3824050c.