Minor fix.
Chnage item label.
Remove menu items that are moving to list navigation.
Use list navigation within A/FD.