diff --git a/frontend/sequences/step_tiles/tile_set_servo_angle.tsx b/frontend/sequences/step_tiles/tile_set_servo_angle.tsx
index 2216b17f9..a758dc708 100644
--- a/frontend/sequences/step_tiles/tile_set_servo_angle.tsx
+++ b/frontend/sequences/step_tiles/tile_set_servo_angle.tsx
@@ -61,13 +61,7 @@ export function TileSetServoAngle(props: StepParams) {
       confirmStepDeletion={props.confirmStepDeletion} />
     <StepContent className={className}>
       <Row>
-        <Col xs={12}>
-          <label>{t("Servo pin")}</label>
-          <ServoPinSelection {...props} />
-        </Col>
-      </Row>
-      <Row>
-        <Col xs={12}>
+        <Col lg={4} xs={6}>
           <label>
             {t("Servo angle (0-180)")}
           </label>
@@ -78,6 +72,10 @@ export function TileSetServoAngle(props: StepParams) {
             index={index}
             field={"pin_value"} />
         </Col>
+        <Col lg={8} xs={6}>
+          <label>{t("Servo pin")}</label>
+          <ServoPinSelection {...props} />
+        </Col>
       </Row>
     </StepContent>
   </StepWrapper>;
diff --git a/frontend/sequences/step_tiles/tile_toggle_pin.tsx b/frontend/sequences/step_tiles/tile_toggle_pin.tsx
index 5d51eb9a1..9ac8efd92 100644
--- a/frontend/sequences/step_tiles/tile_toggle_pin.tsx
+++ b/frontend/sequences/step_tiles/tile_toggle_pin.tsx
@@ -19,7 +19,7 @@ export function TileTogglePin(props: StepParams) {
       confirmStepDeletion={props.confirmStepDeletion} />
     <StepContent className={className}>
       <Row>
-        <PinSelect {...props} width={12} />
+        <PinSelect {...props} width={6} />
       </Row>
     </StepContent>
   </StepWrapper>;