CHIPPY-200, CHIPPY-201: Custom stages show up in main menu again CHIPPY-190: Some plugin menu cleanup