Added navigation tabs
Finished navigation