Adding navbar and other infrastructure