Fixed minor issues with form modal and model row with optional behavior