Removed continue and done button form edit view, added closing cross (osx)
Merge branch 'master' into builds
7.757