Added tabbed navigation *Needs to be tested*