Refactoring home.html and a couple others