Correctly manage additional management dialog controls, removed redundant code