styled out comment modal, added active class styles on nav
ok
merging unmerged files from master