updated general form design