Fixed constants. Working on Menu State