Improved forms layout