mostly edit displaying - still to save.  Have added textfield frame movement
Merge remote-tracking branch 'origin/master'
Revert 1e4ee9b..b9a0c88

This rolls back to commit 1e4ee9bf2fca11ce291c9a6e3b6a070e65556d8a.
initial