added nav bar to for and against
fixed merge conflicts