update edit screen
Merge branch 'master' of https://github.com/inboundnow/calls-to-action
updates to UI and removing empty tokens
Merge branch 'master' of https://github.com/inboundnow/calls-to-action