Improved formatting of forms