edited menu and css
merged