RS redesign - form changes