added nav bar, more structure