Bugfix: retain picture control
Save updated field formatting experiments, before moving and adding JUnit tests
Field formatting improvements and JUnit tests