top nav sorta working
added comment count
merge nothing conflict