updated base template and nav bar