Updated menu support, added Back class support