Cleanup: updated control menu class