Layout refactor and landing page setup