#182 - Align homepage with final wireframes