Added EditMenu and Fixed up lists