put navbar stuff back inside pages, added data ids
fixed navbar shnizzle