fixed bugs related to question. also updated templates to have the navbar