Cleaned up Category contextMenus and categoryAdd