CSS cleanup and better media-nav