Rearrange the nav HTML and CSS to have less markup