diff --git a/front-generator/render.py b/front-generator/render.py
index b47ce97..43d6d79 100644
--- a/front-generator/render.py
+++ b/front-generator/render.py
@@ -28,8 +28,8 @@ def extract_param_names(mc):
                 case 'checkbox': return [{"initValue": 'false'} | copy_fields]
                 case 'number': return [{"initValue": widget['min'] if widget['min'] else '0'} | copy_fields]
                 case 'number-int': return [{"initValue": "0"} | copy_fields]
-                case 'modulation-modcod': return [{"name": widget['name'] + "Modulation", "initValue": '"QPSK"'} | copy_fields]
-                case 'modulation-speed': return [{"name": widget['name'] + "Speed", "initValue": '"1/4"'} | copy_fields]
+                case 'modulation-modcod': return [copy_fields | {"name": widget['name'] + "Modulation", "initValue": '"QPSK"'}]
+                case 'modulation-speed': return [copy_fields | {"name": widget['name'] + "Speed", "initValue": '"1/4"'}]
                 case 'watch': return []
 
             return [{"initValue": 'null'} | copy_fields]
diff --git a/front-generator/template/common/monitoring.html.j2 b/front-generator/template/common/monitoring.html.j2
index 62fc366..0b850f1 100644
--- a/front-generator/template/common/monitoring.html.j2
+++ b/front-generator/template/common/monitoring.html.j2
@@ -19,11 +19,7 @@
                     <tr><th>Ошибка ФАПЧ</th><td>{{ statRx.pllError }}</td></tr>
                     <tr><th>Инф. скорость на приеме</th><td>{{ statRx.speedOnRxKbit }} кбит/с</td></tr>
                     <tr><th>Инф. скорость на интерфейсе</th><td>{{ statRx.speedOnIifKbit }} кбит/с</td></tr>
-                    </tbody>
-                </table>
-                <p> Статистика пакетов </p>
-                <table>
-                    <tbody>
+                    <tr><td colspan="2" style="padding-top: 1em; text-align: center">Статистика пакетов</td></tr>
                     <tr><th>Качественных пакетов</th><td>{{ statRx.packetsOk }}</td></tr>
                     <tr><th>Поврежденных пакетов</th><td>{{ statRx.packetsBad }}</td></tr>
                     <tr><th>DUMMY</th><td>{{ statRx.packetsDummy }}</td></tr>
diff --git a/front-generator/template/common/qos-methods.js.j2 b/front-generator/template/common/qos-methods.js.j2
index 3ae5fb4..fb80cc8 100644
--- a/front-generator/template/common/qos-methods.js.j2
+++ b/front-generator/template/common/qos-methods.js.j2
@@ -73,9 +73,9 @@
 
             updateQosSettings(vals) {
                 this.submitStatusQos = false
-                this.paramQos.en = vals["settings"]["qos.enabled"]
+                this.paramQos.en = vals["settings"]["qosEnabled"]
 
-                const qosProfile = vals["settings"]["qos.profile"]
+                const qosProfile = vals["settings"]["qosProfile"]
                 if (qosProfile !== null && qosProfile !== undefined) {
                     this.paramQos.rt1 = [] // .splice(0, this.paramQos.rt1.length)
                     this.paramQos.rt2 = [] // .splice(0, this.paramQos.rt2.length)
diff --git a/src/server/connection.cpp b/src/server/connection.cpp
index 6a25f1d..eebd6b5 100644
--- a/src/server/connection.cpp
+++ b/src/server/connection.cpp
@@ -59,7 +59,8 @@ namespace http::server {
             reply_.headers.push_back({.name = "Connection", .value = "keep-alive"});
         }
 
-        BOOST_LOG_TRIVIAL(info) << "HTTP query " << reply_.status << " " << request_.method << " " << request_.queryUri;
+        const auto ep = socket_.remote_endpoint();
+        BOOST_LOG_TRIVIAL(info) << "HTTP query " << ep.address().to_string() << ":" << ep.port() << " " << reply_.status << " " << request_.method << " " << request_.queryUri;
 
         auto self(shared_from_this());
         async_write(socket_, reply_.to_buffers(), [this, self](boost::system::error_code ec, std::size_t) {
@@ -92,6 +93,7 @@ namespace http::server {
 
     void SslConnection::stop() {
         try {
+            stream_.next_layer().socket().close();
             stream_.shutdown();
         } catch (std::exception& e) {
             BOOST_LOG_TRIVIAL(warning) << "SslConnection::stop(): Can't shutdown ssl socket: " << e.what();
@@ -133,7 +135,8 @@ namespace http::server {
             reply_.headers.push_back({.name = "Connection", .value = "keep-alive"});
         }
 
-        BOOST_LOG_TRIVIAL(info) << "HTTPS query " << reply_.status << " " << request_.method << " " << request_.queryUri;
+        const auto ep = stream_.next_layer().socket().remote_endpoint();
+        BOOST_LOG_TRIVIAL(info) << "HTTPS query " << ep.address().to_string() << ":" << ep.port() << " " << reply_.status << " " << request_.method << " " << request_.queryUri;
 
         auto self(shared_from_this());
         async_write(stream_, reply_.to_buffers(), [this, self](boost::system::error_code ec, std::size_t) {
diff --git a/src/terminal_api_driver.cpp b/src/terminal_api_driver.cpp
index 2c14764..c2dc14c 100644
--- a/src/terminal_api_driver.cpp
+++ b/src/terminal_api_driver.cpp
@@ -1037,7 +1037,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
 #ifdef MODEM_IS_SCPC
     mod.baudrate = pt.get<uint32_t>("txBaudrate");
     mod.rollof = pt.get<unsigned int>("txRolloff");
-    mod.gold_seq_is_active = pt.get<bool>("txGoldan");
+    mod.gold_seq_is_active = pt.get<unsigned int>("txGoldan");
 #endif
     mod.attenuation = pt.get<double>("txAttenuation");
 
@@ -1054,7 +1054,7 @@ void api_driver::ApiDriver::setRxTxSettings(boost::property_tree::ptree &pt) {
     demod.baudrate = pt.get<uint32_t>("rxBaudrate");
     demod.rollof = pt.get<unsigned int>("rxRolloff");
 #ifdef MODEM_IS_SCPC
-    demod.gold_seq_is_active = pt.get<bool>("rxGoldan");
+    demod.gold_seq_is_active = pt.get<unsigned int>("rxGoldan");
 #endif
 
 #ifdef MODEM_IS_SCPC
diff --git a/static/fields.css b/static/fields.css
index 065faa9..e9cb9d5 100644
--- a/static/fields.css
+++ b/static/fields.css
@@ -87,10 +87,11 @@
 .settings-set-container th {
     text-align: left;
     font-weight: normal;
-    padding-right: 1em;
+    padding: 0.2em 1em 0.2em 0.2em;
 }
 .settings-set-container td {
     min-width: 10em;
+    padding: 0.2em;
 }
 .tabs-item-flex-container h2 {
     margin-top: 0;
diff --git a/static/main-scpc.html b/static/main-scpc.html
index 51275a9..8fa70bc 100644
--- a/static/main-scpc.html
+++ b/static/main-scpc.html
@@ -73,11 +73,7 @@
                     <tr><th>Ошибка ФАПЧ</th><td>{{ statRx.pllError }}</td></tr>
                     <tr><th>Инф. скорость на приеме</th><td>{{ statRx.speedOnRxKbit }} кбит/с</td></tr>
                     <tr><th>Инф. скорость на интерфейсе</th><td>{{ statRx.speedOnIifKbit }} кбит/с</td></tr>
-                    </tbody>
-                </table>
-                <p> Статистика пакетов </p>
-                <table>
-                    <tbody>
+                    <tr><td colspan="2" style="padding-top: 1em; text-align: center">Статистика пакетов</td></tr>
                     <tr><th>Качественных пакетов</th><td>{{ statRx.packetsOk }}</td></tr>
                     <tr><th>Поврежденных пакетов</th><td>{{ statRx.packetsBad }}</td></tr>
                     <tr><th>DUMMY</th><td>{{ statRx.packetsDummy }}</td></tr>
@@ -598,12 +594,12 @@
                     dvbServicePacketPeriod: 0,
                     dvbIsAcm: false,
                     txFrameSizeNormal: true,
-                    dvbCcm: "QPSK",
-                    dvbCcm: "1/4",
-                    dvbAcmMin: "QPSK",
-                    dvbAcmMin: "1/4",
-                    dvbAcmMax: "QPSK",
-                    dvbAcmMax: "1/4",
+                    dvbCcmModulation: "QPSK",
+                    dvbCcmSpeed: "1/4",
+                    dvbAcmMinModulation: "QPSK",
+                    dvbAcmMinSpeed: "1/4",
+                    dvbAcmMaxModulation: "QPSK",
+                    dvbAcmMaxSpeed: "1/4",
                     dvbSnrReserve: 0,
                     aupcEn: false,
                     aupcMinAttenuation: 0,
@@ -786,12 +782,12 @@
                     "dvbServicePacketPeriod": this.paramRxtx.dvbServicePacketPeriod,
                     "dvbIsAcm": this.paramRxtx.dvbIsAcm,
                     "txFrameSizeNormal": this.paramRxtx.txFrameSizeNormal,
-                    "dvbCcm": this.paramRxtx.dvbCcmModulation,
-                    "dvbCcm": this.paramRxtx.dvbCcmSpeed,
-                    "dvbAcmMin": this.paramRxtx.dvbAcmMinModulation,
-                    "dvbAcmMin": this.paramRxtx.dvbAcmMinSpeed,
-                    "dvbAcmMax": this.paramRxtx.dvbAcmMaxModulation,
-                    "dvbAcmMax": this.paramRxtx.dvbAcmMaxSpeed,
+                    "dvbCcmModulation": this.paramRxtx.dvbCcmModulationModulation,
+                    "dvbCcmSpeed": this.paramRxtx.dvbCcmSpeedSpeed,
+                    "dvbAcmMinModulation": this.paramRxtx.dvbAcmMinModulationModulation,
+                    "dvbAcmMinSpeed": this.paramRxtx.dvbAcmMinSpeedSpeed,
+                    "dvbAcmMaxModulation": this.paramRxtx.dvbAcmMaxModulationModulation,
+                    "dvbAcmMaxSpeed": this.paramRxtx.dvbAcmMaxSpeedSpeed,
                     "dvbSnrReserve": this.paramRxtx.dvbSnrReserve,
                     "aupcEn": this.paramRxtx.aupcEn,
                     "aupcMinAttenuation": this.paramRxtx.aupcMinAttenuation,
@@ -897,12 +893,12 @@
                 this.paramRxtx.dvbServicePacketPeriod = vals["settings"]["dvbServicePacketPeriod"]
                 this.paramRxtx.dvbIsAcm = vals["settings"]["dvbIsAcm"]
                 this.paramRxtx.txFrameSizeNormal = vals["settings"]["txFrameSizeNormal"]
-                this.paramRxtx.dvbCcmModulation = vals["settings"]["dvbCcm"]
-                this.paramRxtx.dvbCcmSpeed = vals["settings"]["dvbCcm"]
-                this.paramRxtx.dvbAcmMinModulation = vals["settings"]["dvbAcmMin"]
-                this.paramRxtx.dvbAcmMinSpeed = vals["settings"]["dvbAcmMin"]
-                this.paramRxtx.dvbAcmMaxModulation = vals["settings"]["dvbAcmMax"]
-                this.paramRxtx.dvbAcmMaxSpeed = vals["settings"]["dvbAcmMax"]
+                this.paramRxtx.dvbCcmModulationModulation = vals["settings"]["dvbCcmModulation"]
+                this.paramRxtx.dvbCcmSpeedSpeed = vals["settings"]["dvbCcmSpeed"]
+                this.paramRxtx.dvbAcmMinModulationModulation = vals["settings"]["dvbAcmMinModulation"]
+                this.paramRxtx.dvbAcmMinSpeedSpeed = vals["settings"]["dvbAcmMinSpeed"]
+                this.paramRxtx.dvbAcmMaxModulationModulation = vals["settings"]["dvbAcmMaxModulation"]
+                this.paramRxtx.dvbAcmMaxSpeedSpeed = vals["settings"]["dvbAcmMaxSpeed"]
                 this.paramRxtx.dvbSnrReserve = vals["settings"]["dvbSnrReserve"]
                 this.paramRxtx.aupcEn = vals["settings"]["aupcEn"]
                 this.paramRxtx.aupcMinAttenuation = vals["settings"]["aupcMinAttenuation"]
@@ -1153,9 +1149,9 @@
 
             updateQosSettings(vals) {
                 this.submitStatusQos = false
-                this.paramQos.en = vals["settings"]["qos.enabled"]
+                this.paramQos.en = vals["settings"]["qosEnabled"]
 
-                const qosProfile = vals["settings"]["qos.profile"]
+                const qosProfile = vals["settings"]["qosProfile"]
                 if (qosProfile !== null && qosProfile !== undefined) {
                     this.paramQos.rt1 = [] // .splice(0, this.paramQos.rt1.length)
                     this.paramQos.rt2 = [] // .splice(0, this.paramQos.rt2.length)
diff --git a/static/main-tdma.html b/static/main-tdma.html
index 5ef8ac4..07099c4 100644
--- a/static/main-tdma.html
+++ b/static/main-tdma.html
@@ -72,11 +72,7 @@
                     <tr><th>Ошибка ФАПЧ</th><td>{{ statRx.pllError }}</td></tr>
                     <tr><th>Инф. скорость на приеме</th><td>{{ statRx.speedOnRxKbit }} кбит/с</td></tr>
                     <tr><th>Инф. скорость на интерфейсе</th><td>{{ statRx.speedOnIifKbit }} кбит/с</td></tr>
-                    </tbody>
-                </table>
-                <p> Статистика пакетов </p>
-                <table>
-                    <tbody>
+                    <tr><td colspan="2" style="padding-top: 1em; text-align: center">Статистика пакетов</td></tr>
                     <tr><th>Качественных пакетов</th><td>{{ statRx.packetsOk }}</td></tr>
                     <tr><th>Поврежденных пакетов</th><td>{{ statRx.packetsBad }}</td></tr>
                     <tr><th>DUMMY</th><td>{{ statRx.packetsDummy }}</td></tr>