Reformatted, added Navbar and placeholder features