Move navbar into main container.
Move comments