Updated with new navbar
New main page layout