Cleanup powermenu and add 4 state version expanded desktop