diff --git a/web/skins/classic/views/control.php b/web/skins/classic/views/control.php
index a9af1b29d..a219a93c3 100644
--- a/web/skins/classic/views/control.php
+++ b/web/skins/classic/views/control.php
@@ -50,8 +50,6 @@ require_once( ZM_SKIN_PATH.'/includes/control_functions.php' );
 $sql = "select C.*,M.* from Monitors as M inner join Controls as C on (M.ControlId = C.Id ) where M.Id = '".$mid."'";
 $monitor = dbFetchOne( $sql );
 
-$cmds = getControlCommands( $monitor );
-
 $focusWindow = true;
 
 xhtmlHeaders(__FILE__, $SLANG['Control'] );
@@ -71,36 +69,8 @@ xhtmlHeaders(__FILE__, $SLANG['Control'] );
       </div>
     </div>
     <div id="content">
-      <div id="ptzControls">
-        <div id="controlsPanel">
-<?php
-        if ( $monitor['CanFocus'] )
-            echo controlFocus( $monitor );
-        if ( $monitor['CanZoom'] )
-            echo controlZoom( $monitor );
-        if ( $monitor['CanMove'] || ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] ) )
-        {
-?>
-          <div id="pantiltPanel">
-<?php
-            if ( $monitor['CanMove'] )
-                echo controlPanTilt( $monitor );
-            if ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] )
-                echo controlPower( $monitor );
-?>
-          </div>
-<?php
-        }
-        if ( $monitor['CanIris'] )
-            echo controlIris( $monitor );
-        if ( $monitor['CanWhite'] )
-            echo controlWhite( $monitor );
-?>
-        </div>
-<?php
-        if ( $monitor['HasPresets'] )
-            echo controlPresets( $monitor );
-?>
+      <div id="ptzControls" class="ptzControls">
+<?= ptzControls( $monitor ) ?>
       </div>
     </div>
   </div>
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 59775f438..29f43bc37 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -149,38 +149,9 @@ if ( canEdit( 'Monitors' ) )
 if ( $showControls )
 {
     require_once( ZM_SKIN_PATH.'/includes/control_functions.php' );
-    $cmds = getControlCommands( $monitor );
-?>
-      <div id="ptzControls"<?= $_REQUEST['control']?'':' class="hidden"' ?>>
-        <div id="controlsPanel">
-<?php
-        if ( $monitor['CanFocus'] )
-            echo controlFocus( $monitor );
-        if ( $monitor['CanZoom'] )
-            echo controlZoom( $monitor );
-        if ( $monitor['CanMove'] || ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] ) )
-        {
-?>
-          <div id="pantiltPanel">
-<?php
-            if ( $monitor['CanMove'] )
-                echo controlPanTilt( $monitor );
-            if ( $monitor['CanWake'] || $monitor['CanSleep'] || $monitor['CanReset'] )
-                echo controlPower( $monitor );
-?>
-          </div>
-<?php
-        }
-        if ( $monitor['CanIris'] )
-            echo controlIris( $monitor );
-        if ( $monitor['CanWhite'] )
-            echo controlWhite( $monitor );
-?>
-        </div>
-<?php
-        if ( $monitor['HasPresets'] )
-            echo controlPresets( $monitor );
 ?>
+      <div id="ptzControls" class="ptzControls<?= $_REQUEST['control']?'':' hidden' ?>">
+<?= ptzControls( $monitor ) ?>
       </div>
 <?php
 }