#1718 Intermediate work on menus
#1718 Remap fix and default control sharing
#1718 Almost all support done
#1718 Cleanup