Plus minor repositioning for better readability

* Map type now set from General settings
* No map type control in maps

This closes out all value editing before the new item is added. Fixes
the bug where you enter a new altitude in last waypoint, don't press
enter and then add a new one. In that case altitude would be set after
new item was added. Hence it would not carry to new item.

Should be all working now except for distance < radius cases.

Otherwise things go haywire when points are added