Added enumerated list selector
Tweaked other menu functions