refactor + home page visible again :)