Final tweaks to edit screen