small layout and form changes