added some helpers
updated nav links
update nav highlighting