The bad commit tried to improve, but failed again

Menu changes, PM support added. A lot of other stuff.