Landing page refactoring