diff --git a/include/tui.h b/include/tui.h
index 5d073ae..d65e6a4 100644
--- a/include/tui.h
+++ b/include/tui.h
@@ -57,7 +57,7 @@ private:
     static WINDOW *createDetailViewWindow( int iXSize, int iYSize, int iXStart, Drive drive);
     static WINDOW *overwriteDetailViewWindow( int iXSize, int iYSize, int iXStart);
     static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, string sModelFamily, string sModelName, string sCapacity, string sState, bool bSelected);
-    static WINDOW *createSystemStats(int iXSize, int iYSize, int iYStart);
+    static WINDOW *createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart);
     static WINDOW *createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate);
     static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string selectedTask, string optionA, string optionB);
     static WINDOW* createFrozenWarning(int iXSize, int iYSize, int iXStart, int iYStart, string sPath, string sModelFamily, string sModelName, string sSerial, string sProgress);
diff --git a/src/tui.cpp b/src/tui.cpp
index 688299c..8244961 100644
--- a/src/tui.cpp
+++ b/src/tui.cpp
@@ -61,10 +61,10 @@ void TUI::updateTUI(vector <Drive>* pvecDrives, uint8_t u8SelectedEntry)
 
     refresh();
 
-    overview=createOverViewWindow((int)(u16StdscrX/3), (u16StdscrY-15));
+    overview=createOverViewWindow((int)(u16StdscrX/3), (u16StdscrY-3));
     wrefresh(overview);
 
-    systemview=createSystemStats((int)(u16StdscrX/3), 10, (u16StdscrY-11));
+    systemview=createSystemStats((int)(u16StdscrX/3), 10, u16StdscrX-(int)(u16StdscrX/3)-2, (u16StdscrY-11 ));
     wrefresh(systemview);
 
     delwin(detailview);
@@ -315,10 +315,10 @@ WINDOW* TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart,
     return newWindow;
 }
 
-WINDOW* TUI::createSystemStats(int iXSize, int iYSize, int iYStart)
+WINDOW* TUI::createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart)
 {
     WINDOW *newWindow;
-    newWindow = newwin(iYSize, iXSize, iYStart, 2);
+    newWindow = newwin(iYSize, iXSize, iYStart, iXStart);
 
     wbkgd(newWindow, COLOR_PAIR(COLOR_AREA_OVERVIEW));
     box(newWindow, ACS_VLINE, ACS_HLINE);
@@ -360,20 +360,24 @@ WINDOW* TUI::createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, st
 
     centerTitle(newWindow, "Controls");
 
-
     uint16_t u16Line = 2;
 
     if(menustate.bAbort)
         {
-            mvwaddstr(newWindow,u16Line++, 3, "Press A for Abort");
+            string sLineTmp = "Press A for Abort";
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
+            u16Line++;
         }
     if(menustate.bShred)
         {
-            mvwaddstr(newWindow,u16Line++, 3, "Press S for Shred");
+            string sLineTmp = "Press S for Shred ";
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
+            u16Line++;
         }
     if(menustate.bDelete)
         {
-            mvwaddstr(newWindow,u16Line++, 3, "Press D for Delete");
+            string sLineTmp = "Press D for Delete";
+            mvwaddstr(newWindow,u16Line++, (iXSize/2)-(sLineTmp.size()/2), sLineTmp.c_str());
         }
 
     return newWindow;
@@ -471,7 +475,7 @@ void TUI::displaySelectedDrive(Drive drive, int stdscrX, int stdscrY)
     detailview=createDetailViewWindow(((stdscrX)-(int)(stdscrX/3)-7), (stdscrY-15), (int)(stdscrX/3)+5, drive);
     wrefresh(detailview);
 
-    menuview=createMenuView(((stdscrX)-(int)(stdscrX/3)-7), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate);
+    menuview=createMenuView(((int)(stdscrX/3)-10 ), 10, (int)(stdscrX/3)+5,(stdscrY-11), menustate);
     wrefresh(menuview);
 
     if(menustate.bConfirmShred == true)