Re-factory Commands and Menu