Adding comment counts and extracting menu to includes