Simplified the form and added default controls to simple dialog so that we can compare behaviour.