Updated page layout, added page navbar