diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 46dc2bc1a..b42bb9aa3 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -378,6 +378,12 @@ void FeedMessageViewer::initializeViews() {
 
   // Add toolbar and main feeds/messages widget to main layout.
   central_layout->addWidget(m_feedSplitter);
+
+  setTabOrder(m_feedsView, m_messagesView);
+  setTabOrder(m_messagesView, m_toolBarFeeds);
+  setTabOrder(m_toolBarFeeds, m_toolBarMessages);
+  setTabOrder(m_toolBarMessages, m_messagesBrowser);
+
 }
 
 void FeedMessageViewer::vacuumDatabase() {
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index c5599cc76..ee734af4d 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -369,6 +369,9 @@ void FeedsView::deleteSelectedItem() {
     // TODO: I do not need to update counts of all items here.
     // Updating counts of parent item (feed) should be enough.
     updateCountsOfAllFeeds(true);
+
+    // TODO: při smazani itemu se neoznaci vedlejsi
+    selectionModel()->select(currentIndex(), QItemSelectionModel::Rows | QItemSelectionModel::SelectCurrent);
   }
   else {
     // Item WAS NOT removed, either database-related error occurred
diff --git a/src/gui/formfeeddetails.ui b/src/gui/formfeeddetails.ui
index 4a8906631..dd8755df2 100644
--- a/src/gui/formfeeddetails.ui
+++ b/src/gui/formfeeddetails.ui
@@ -47,6 +47,9 @@
        <property name="text">
         <string>Type</string>
        </property>
+       <property name="buddy">
+        <cstring>m_cmbType</cstring>
+       </property>
       </widget>
      </item>
      <item row="1" column="1">
@@ -61,6 +64,9 @@
        <property name="text">
         <string>Encoding</string>
        </property>
+       <property name="buddy">
+        <cstring>m_cmbEncoding</cstring>
+       </property>
       </widget>
      </item>
      <item row="2" column="1">
@@ -75,6 +81,9 @@
        <property name="text">
         <string>Auto-update</string>
        </property>
+       <property name="buddy">
+        <cstring>m_cmbAutoUpdateType</cstring>
+       </property>
       </widget>
      </item>
      <item row="3" column="1">
@@ -144,6 +153,9 @@
        <property name="text">
         <string>URL</string>
        </property>
+       <property name="buddy">
+        <cstring>m_txtUrl</cstring>
+       </property>
       </widget>
      </item>
      <item row="6" column="1">
@@ -272,6 +284,9 @@
        <property name="text">
         <string>Fetch metadata</string>
        </property>
+       <property name="buddy">
+        <cstring>m_btnFetchMetadata</cstring>
+       </property>
       </widget>
      </item>
     </layout>
diff --git a/src/gui/formsettings.ui b/src/gui/formsettings.ui
index 98aa1c664..3a84b4cd4 100644
--- a/src/gui/formsettings.ui
+++ b/src/gui/formsettings.ui
@@ -77,6 +77,9 @@
          <property name="text">
           <string>Database driver</string>
          </property>
+         <property name="buddy">
+          <cstring>m_cmbDatabaseDriver</cstring>
+         </property>
         </widget>
        </item>
        <item row="1" column="1">
@@ -161,6 +164,9 @@ Authors of this application are NOT responsible for lost data.</string>
              <property name="text">
               <string>Hostname</string>
              </property>
+             <property name="buddy">
+              <cstring>m_txtMysqlHostname</cstring>
+             </property>
             </widget>
            </item>
            <item row="0" column="1">
@@ -173,6 +179,9 @@ Authors of this application are NOT responsible for lost data.</string>
                <property name="text">
                 <string>Port</string>
                </property>
+               <property name="buddy">
+                <cstring>m_spinMysqlPort</cstring>
+               </property>
               </widget>
              </item>
              <item>
@@ -201,6 +210,9 @@ Authors of this application are NOT responsible for lost data.</string>
              <property name="text">
               <string>Username</string>
              </property>
+             <property name="buddy">
+              <cstring>m_txtMysqlUsername</cstring>
+             </property>
             </widget>
            </item>
            <item row="1" column="1">
@@ -211,6 +223,9 @@ Authors of this application are NOT responsible for lost data.</string>
              <property name="text">
               <string>Password</string>
              </property>
+             <property name="buddy">
+              <cstring>m_txtMysqlPassword</cstring>
+             </property>
             </widget>
            </item>
            <item row="2" column="1">