clean up, added nav bar