Refactor, fixes to home page