nav updates
highlights for category and genre nav
merge master