fixed javascript and updated navbar