Separate control menu plugin into 2 pieces