Refactor Landing Page