updated styles and mobile nav bar
merged master with styles