refactor and landing page