Clean up top navbar markup