added category list to main page as well as navigation
code cleanup (sonar pass)