Improvements in form macros