cleaned up edit controller
Merge commit '385c98a0b927aa889dd2a91c50f0c56192d64ecd'