Simplify form rendering logic