Hide contentmenu-factories without CSS

Also cleaned up the monkey patches a bit