Design and form changes