updated application.html with navbar
updated application layout file to avoid merge