diff --git a/accountdetails.ui b/accountdetails.ui
index 9d4ef432c4d841d58bee9a5b922052d1dafe166f..d6cffdd6bb4cc184fa1f5be67c2c2a6b48f2ec43 100644
--- a/accountdetails.ui
+++ b/accountdetails.ui
@@ -488,7 +488,7 @@
        </sizepolicy>
       </property>
       <attribute name="title">
-       <string>Audio</string>
+       <string>Audio/Video</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="0" column="2">
@@ -564,28 +564,11 @@
          </property>
         </widget>
        </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="video_codec_tab">
-      <property name="sizePolicy">
-       <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-       </sizepolicy>
-      </property>
-      <attribute name="title">
-       <string>Video</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout">
-       <item row="2" column="0">
-        <widget class="QCheckBox" name="lrcfg_isVideoEnabled">
-         <property name="text">
-          <string>Enable Video</string>
-         </property>
-        </widget>
+       <item row="0" column="3">
+        <widget class="QTableView" name="videoCodecView"/>
        </item>
-       <item row="0" column="2">
-        <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item row="0" column="4">
+        <layout class="QVBoxLayout" name="verticalLayout_14">
          <property name="leftMargin">
           <number>0</number>
          </property>
@@ -624,7 +607,7 @@
           </widget>
          </item>
          <item>
-          <spacer name="verticalSpacer_2">
+          <spacer name="verticalSpacer_4">
            <property name="orientation">
             <enum>Qt::Vertical</enum>
            </property>
@@ -641,16 +624,6 @@
          </item>
         </layout>
        </item>
-       <item row="0" column="0">
-        <widget class="QTableView" name="videoCodecView">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="advancedTab">
diff --git a/configurationwidget.ui b/configurationwidget.ui
index 926e3242b10dcf6a1a44ed853088fd9a23dadafd..20231bdd7e62993181e6075059e2dc000b580105 100644
--- a/configurationwidget.ui
+++ b/configurationwidget.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>558</width>
-    <height>475</height>
+    <height>516</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -29,7 +29,7 @@
       </sizepolicy>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>2</number>
      </property>
      <widget class="QWidget" name="generalTab">
       <attribute name="title">