Improve layout and styling of forms