diff --git a/views/server.codec.php b/views/server.codec.php
index d45583b..ff543f4 100644
--- a/views/server.codec.php
+++ b/views/server.codec.php
@@ -35,17 +35,48 @@ if (!empty($_REQUEST['id'])) {
 } else {
     $codec_list = $sccp_codec;
 }
-        
+
 ?>
 
+<!-- TODO: Codec selection has moved to the line level in newer chan-sccp versions and should be moved -->
 <form autocomplete="off" name="frm_codec" id="frm_codec" class="fpbx-submit" action="" method="post">
     <input type="hidden" name="category" value="codecform">
     <input type="hidden" name="Submit" value="Submit">
-    
+
+    <div class="section" data-id="sccp_dcodecs">
+        <!--Codec disallow-->
+        <div class="element-container">
+            <div class="row">
+                <div class="col-md-12">
+                    <div class="row">
+                        <div class="form-group">
+                            <div class="col-md-3">
+                                <label class="control-label" for="sccp_disallow"><?php echo _("Disallow") ?></label>
+                                <i class="fa fa-question-circle fpbx-help-icon" data-for="sccp_disallow"></i>
+                            </div>
+                            <div class="col-md-9 radioset">
+                                <input id="sccp_disallow" type="text" name="sccp_disallow" value="<?php echo $sccp_disalow ?>">
+                                <label for="sccp_disallow"><?php echo _("default : " . $sccp_disalow_def) ?></label>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-md-12">
+                    <span id="sccp_disallow-help" class="help-block fpbx-help-block"><?php echo _("Default : all. Please enter format: alaw,ulaw,...") ?></span>
+                </div>
+            </div>
+        </div>
+        <!--END Codec disallow-->
+    </div>
+
     <!--SCCP Audio Codecs-->
     <div class="section-title" data-for="sccp_acodecs">
         <h3><i class="fa fa-minus"></i><?php echo _("SCCP Audio Codecs ") ?></h3>
     </div>
+
+
     <div class="section" data-id="sccp_acodecs">
         <!--Codecs-->
         <div class="element-container">
@@ -54,7 +85,7 @@ if (!empty($_REQUEST['id'])) {
                     <div class="row">
                         <div class="form-group">
                             <div class="col-md-3">
-                                <label class="control-label" for="codecw"><?php echo _("Allow (audio)") ?></label>
+                                <label class="control-label" for="codecw"><?php echo _("Allow") ?></label>
                             </div>
                             <div class="col-md-9">
                                 <div>
@@ -90,8 +121,9 @@ if (!empty($_REQUEST['id'])) {
         </div>
         <!--END Codecs-->
 
-        <!--END SCCP Audio Codecs-->
     </div>
+    <!--END SCCP Audio Codecs-->
+
     <!--SCCP Video Codecs-->
     <div class="section-title" data-for="sccp_vcodecs">
         <h3><i class="fa fa-minus"></i><?php echo _("SCCP Video Codecs ") ?></h3>
@@ -104,7 +136,7 @@ if (!empty($_REQUEST['id'])) {
                     <div class="row">
                         <div class="form-group">
                             <div class="col-md-3">
-                                <label class="control-label" for="codecw"><?php echo _("Allow (video)") ?></label>
+                                <label class="control-label" for="codecw"><?php echo _("Allow") ?></label>
                             </div>
                             <div class="col-md-9">
                                 <div>
@@ -137,45 +169,8 @@ if (!empty($_REQUEST['id'])) {
                     </div>
                 </div>
             </div>
+            <!--END Codecs-->
         </div>
-        <!--END Codecs-->
         <!--END SCCP Video Codecs-->
     </div>
-
-    <div class="section-title" data-for="sccp_dcodecs">
-        <h3><i class="fa fa-minus"></i><?php echo _("SCCP Disallow Codecs ") ?></h3>
-    </div>
-    <div class="section" data-id="sccp_dcodecs">
-
-        <!--Codec disallow-->
-        <div class="element-container">
-            <div class="row">
-                <div class="col-md-12">
-                    <div class="row">
-                        <div class="form-group">
-                            <div class="col-md-3">
-                                <label class="control-label" for="sccp_disallow"><?php echo _("Disallow") ?></label>
-                                <i class="fa fa-question-circle fpbx-help-icon" data-for="sccp_disallow"></i>
-                            </div>
-                            <div class="col-md-9 radioset">
-                                <input id="sccp_disallow" type="text" name="sccp_disallow" value="<?php echo $sccp_disalow ?>">  
-                                <label for="sccp_disallow"><?php echo _("default : " . $sccp_disalow_def) ?></label>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col-md-12">
-                    <span id="sccp_disallow-help" class="help-block fpbx-help-block"><?php echo _("Default : all. Plz eneter format: alaw,ulaw") ?></span>
-                </div>
-            </div>
-        </div>
-        <!--END Codec disallow-->
-    </div>
-
-    
 </form>
-
-
-