Improved layout of forms.