nicer category list and fix navigation