landing page styles
fixing the specs after style changes
Merged conflicts in navbar