Before landing page refactor