Final polish on form changes