New reestructurations - plain html in forms