Updated menu functions
They can now contain spaces