Added variables dict and fix numbers in menu