Use a nicer menu system