Refactor front page