Undo Field Removal

This pull requests makes sure that:

- removed field will be restored at the same position
- the undo option is discarded after the remaining fields have been ordered

Fixes #1361.