new markup and styles for navbar. now collapses properly