Fixed some quick issues with the toolbox and contextmenu to remove the extra components.