Fix the form rendering - first step