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

This reverts commit 75f0a35bb9b9cbb48f3f863aa834cf71c5c6649a.