Fixed some glitches in categories. Added context menus for categories