Updated markup for forms