--- a/src/foxkit.cpp
+++ b/src/foxkit.cpp
@@ -115,14 +115,14 @@ void foxkit::createActions()
         m_closeTab = new KAction(KIcon("tab-close.png"), i18n("Close Tab"), this);
             m_closeTab->setStatusTip(i18n("Closes the current tab."));
             m_closeTab->setShortcut(i18n("Ctrl+W"));
-            connect(m_closeTab, SIGNAL(triggered()), this, SLOT(closeCurrentTab()));
+            connect(m_closeTab, SIGNAL(triggered()), this, SLOT(closeTab()));
             actionCollection()->addAction("closetab", m_closeTab);
 
         KStandardAction::back(this, SLOT(pageBack()), actionCollection());
         KStandardAction::forward(this, SLOT(pageForward()), actionCollection());
         m_reload = new KAction(KIcon("view-refresh.png"), i18n("Reload"), this);
-            m_closeTab->setStatusTip(i18n("Reloads the current tab."));
-            m_closeTab->setShortcut(i18n("F5"));
+            m_reload->setStatusTip(i18n("Reloads the current tab."));
+            m_reload->setShortcut(i18n("F5"));
             connect(m_reload, SIGNAL(triggered()), this, SLOT(pageReload()));
             actionCollection()->addAction("reload", m_reload);
         KStandardAction::quit(kapp, SLOT(quit()), actionCollection());
@@ -299,13 +299,11 @@ void foxkit::newViewUrl(bool newWin, QUrl url)
                 newTab(url);
 }
 
-void foxkit::closeCurrentTab()
-{
-        closeTab(tabs->currentIndex());
-}
-
 void foxkit::closeTab(int index)
 {
+        if(index == CLOSECURRENT)
+                index = tabs->currentIndex(); // We wanna close the current tab.
+
         //FIXME unless a new tab is created before removing the last tab it will segfault
         //TODO: Make a nice little template for a blank page and show that instead (call it 'about:foxkit'?)
         if(tabs->count() == 1)
@@ -337,7 +335,7 @@ void foxkit::loadProgress(int progress, int index)
         }
 }
 
-//TODO Inline these functions? Maybe connect the buttons directly to m_activeView->back()?
+//TODO Connect the buttons directly to m_activeView->back() and delete these?
 void foxkit::pageBack()
 {
         m_activeView->back();

--- a/src/foxkit.h
+++ b/src/foxkit.h
@@ -41,6 +41,8 @@ class QStatusBar;
 class QProgressBar;
 #include <KLineEdit>
 
+#define CLOSECURRENT -5
+
 class foxkit : public KXmlGuiWindow
 {
         Q_OBJECT
@@ -69,8 +71,7 @@ private slots:
         void setCurrentTitle(QString title, int);
         void setIcon(QIcon icon, int index);
         void setStatusBarText(QString text, int);
-        void closeCurrentTab();
-        void closeTab(int index);
+        void closeTab(int index = CLOSECURRENT);
         void loadProgress(int progress, int index);
         void newViewUrl(bool newWin, QUrl url);
 

--- a/src/webtab.cpp
+++ b/src/webtab.cpp
@@ -31,30 +31,30 @@ webTab::webTab(QWidget* parent): QTabWidget(parent)
 
 webTab::~webTab()
 {
-        tabs->deleteLater();
+        tabBar()->deleteLater();
 }
 
 void webTab::hideTabs()
 {
-        tabs->hide();
+        tabBar()->hide();
 }
 void webTab::showTabs()
 {
-        tabs->show();
+        tabBar()->show();
 }
 
 void webTab::closeTab(int index)
 {
         removeTab(index);
         if(count() <= 1)
-                tabs->hide();
+                tabBar()->hide();
 }
 
 int webTab::newTab(QWidget * page, const QString & label)
 {
         int tmp = addTab(page, label);
         if(count() > 1)
-                tabs->show();
+                tabBar()->show();
         return tmp;
 }