menu categories + minor changes