tweaks to landing page
nav bar updates
conflict resolved