diff --git a/lib/python/qtvcp/widgets/camview_widget.py b/lib/python/qtvcp/widgets/camview_widget.py
index 827d9c8c6..00ae2d8cf 100644
--- a/lib/python/qtvcp/widgets/camview_widget.py
+++ b/lib/python/qtvcp/widgets/camview_widget.py
@@ -99,8 +99,8 @@ class CamView(QtWidgets.QWidget, _HalWidgetBase):
                 self.rotation += self.rotationIncrement
         if self.diameter < 2: self.diameter = 2
         if self.diameter > w: self.diameter = w
-        if self.rotation > 360: self.rotation = 0
-        if self.rotation < 0: self.rotation = 360
+        if self.rotation > 360 - self.rotationIncrement: self.rotation = 0
+        if self.rotation < 0: self.rotation = 360 - self.rotationIncrement
         if self.scale < 1: self.scale = 1
         if self.scale > 5: self.scale = 5
 
diff --git a/share/qtvcp/panels/cam_align/cam_align.ui b/share/qtvcp/panels/cam_align/cam_align.ui
index 42378548c..1b277a1c4 100644
--- a/share/qtvcp/panels/cam_align/cam_align.ui
+++ b/share/qtvcp/panels/cam_align/cam_align.ui
@@ -63,7 +63,7 @@
       <item>
        <widget class="ActionButton" name="actionbutton">
         <property name="text">
-         <string> GOTO Origin</string>
+         <string>GOTO Origin</string>
         </property>
         <property name="mdi_command_action" stdset="0">
          <bool>false</bool>
@@ -128,7 +128,7 @@
          <string>Y %10.3f</string>
         </property>
         <property name="imperial_template" stdset="0">
-         <string>X %9.4f</string>
+         <string>Y %9.4f</string>
         </property>
        </widget>
       </item>
@@ -144,7 +144,7 @@
          <string>Z %10.3f</string>
         </property>
         <property name="imperial_template" stdset="0">
-         <string>X %9.4f</string>
+         <string>Z %9.4f</string>
         </property>
        </widget>
       </item>