Fixed layout inconsistencies for forms