4 files changed, 23 insertions, 11 deletions
diff --git a/src/ui/widgets/FilePage.cpp b/src/ui/widgets/FilePage.cpp
index 42cedfd9..91299f7f 100644
--- a/src/ui/widgets/FilePage.cpp
+++ b/src/ui/widgets/FilePage.cpp
@@ -46,13 +46,13 @@ FilePage::FilePage(QWidget *parent) : QWidget(parent) {
 
     createPopupMenu();
 
-    upLevelButton = new QPushButton("UP Level");
+    upLevelButton = new QPushButton("<");
     connect(upLevelButton, SIGNAL(clicked(bool)), this, SLOT(slotUpLevel()));
 
     refreshButton = new QPushButton("Refresh");
     connect(refreshButton, SIGNAL(clicked(bool)), this, SLOT(slotGoPath()));
 
-    goPathButton = new QPushButton("Go Path");
+    goPathButton = new QPushButton("Go");
     connect(goPathButton, SIGNAL(clicked(bool)), this, SLOT(slotGoPath()));
 
     pathEdit = new QLineEdit();
@@ -65,10 +65,12 @@ FilePage::FilePage(QWidget *parent) : QWidget(parent) {
     menuLayout->setStretchFactor(pathEdit, 8);
     menuLayout->addWidget(goPathButton);
     menuLayout->setStretchFactor(goPathButton, 1);
-    menuLayout->addWidget(refreshButton);
-    menuLayout->setStretchFactor(refreshButton, 1);
+    // menuLayout->addWidget(refreshButton);
+    // menuLayout->setStretchFactor(refreshButton, 1);
 
     auto *layout = new QVBoxLayout();
+    layout->setContentsMargins(0, 0, 0, 0);
+    layout->setSpacing(0);
     layout->addLayout(menuLayout);
     layout->setStretchFactor(menuLayout, 1);
     layout->addWidget(dirTreeView);
diff --git a/src/ui/widgets/InfoBoardWidget.cpp b/src/ui/widgets/InfoBoardWidget.cpp
index d1de76f4..33517a8e 100644
--- a/src/ui/widgets/InfoBoardWidget.cpp
+++ b/src/ui/widgets/InfoBoardWidget.cpp
@@ -31,6 +31,7 @@ InfoBoardWidget::InfoBoardWidget(QWidget *parent, GpgME::GpgContext *ctx, KeyLis
     infoBoard->setReadOnly(true);
     infoBoard->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
     infoBoard->setMinimumWidth(480);
+    infoBoard->setContentsMargins(0, 0, 0, 0);
 
     connect(mCtx, SIGNAL(signalKeyInfoChanged()), this, SLOT(slotReset()));
 
@@ -42,22 +43,35 @@ InfoBoardWidget::InfoBoardWidget(QWidget *parent, GpgME::GpgContext *ctx, KeyLis
     importFromKeyserverAct->setVisible(false);
 
     QWidget *actionButtonMenu = new QWidget();
+    actionButtonMenu->setContentsMargins(0, 0, 0, 0);
+    actionButtonMenu->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+    actionButtonMenu->setFixedHeight(36);
+
     actionButtonLayout = new QHBoxLayout();
+    actionButtonLayout->setContentsMargins(0, 0, 0, 0);
+    actionButtonLayout->setSpacing(0);
     actionButtonMenu->setLayout(actionButtonLayout);
+
     auto label = new QLabel("Optional Actions Menu");
+    label->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
+    label->setContentsMargins(0, 0, 0, 0);
+
     actionButtonLayout->addWidget(label);
     actionButtonLayout->addStretch();
 
-    actionButtonMenu->setFixedHeight(42);
 
     QFrame *line;
     line = new QFrame(this);
     line->setFrameShape(QFrame::HLine);
     line->setFrameShadow(QFrame::Sunken);
+    line->setContentsMargins(0, 0, 0, 0);
 
     auto *notificationWidgetLayout = new QVBoxLayout(this);
+    notificationWidgetLayout->setContentsMargins(0, 0, 0, 0);
+    notificationWidgetLayout->setSpacing(0);
+
     notificationWidgetLayout->addWidget(infoBoard);
-    notificationWidgetLayout->setStretchFactor(infoBoard, 8);
+    notificationWidgetLayout->setStretchFactor(infoBoard, 10);
     notificationWidgetLayout->addWidget(actionButtonMenu);
     notificationWidgetLayout->setStretchFactor(actionButtonMenu, 1);
     notificationWidgetLayout->addWidget(line);
diff --git a/src/ui/widgets/KeyList.cpp b/src/ui/widgets/KeyList.cpp
index 581cc91c..b044020a 100644
--- a/src/ui/widgets/KeyList.cpp
+++ b/src/ui/widgets/KeyList.cpp
@@ -215,7 +215,6 @@ void KeyList::slotRefresh()
         ++row_index;
     }
 
-
     setChecked(keyList);
 }
 
diff --git a/src/ui/widgets/VerifyKeyDetailBox.cpp b/src/ui/widgets/VerifyKeyDetailBox.cpp
index 3a0695b8..e0f79c3e 100644
--- a/src/ui/widgets/VerifyKeyDetailBox.cpp
+++ b/src/ui/widgets/VerifyKeyDetailBox.cpp
@@ -26,10 +26,7 @@
 
 VerifyKeyDetailBox::VerifyKeyDetailBox(QWidget *parent, GpgME::GpgContext *ctx, KeyList *keyList,
                                        gpgme_signature_t signature) :
-        QGroupBox(parent) {
-    this->mCtx = ctx;
-    this->mKeyList = keyList;
-    this->fpr = signature->fpr;
+        QGroupBox(parent), mCtx(ctx), mKeyList(keyList), fpr(signature->fpr) {
 
     auto *vbox = new QVBoxLayout();