change nav and some other css
merge diffs