changed landing page back
merged conflicts