made current section also appear in navbar; improved structure