Changes to navbar. Improvments to javascript