Add demo menu items back in, using new command system