layout and form changes