Finished porting to new menu system