Improve form design