fixing issues post navbarpocalypse
fixing issues post navbarpocalypse