Improve form layout