Completely rejiggered the management menu