Work on #44 - Update PM menu