Context menu switch? And/or dual columns?

Moving the hidden items into a sub-menu is the easiest solution.