Now with editing features!

Also some cleanup and some rewiring.
Streamlined function spacing layout
Updated ActionTypes according to editor cases