Add additional layer of layouts and restructure navbar and more