Merge nav

Fixed merge conflicts in css/