--- /dev/null
+++ b/examples/examples_config.pri
@@ -0,0 +1,6 @@
+
+SRC_DIR = $$PWD/../src/
+
+INCLUDEPATH += $$SRC_DIR
+LIBS += -L$$SRC_DIR/../lib -lsif
+

--- a/examples/simple/main.cpp
+++ b/examples/simple/main.cpp
@@ -20,11 +20,14 @@
 
 #include <QApplication>
 
+#include "sif/mainwindow.h"
+
 int main(int argc, char **argv)
 {
 	QApplication app(argc, argv);
 	
-	
+	SIF::MainWindow mw;
+    mw.show();
 	
 	return app.exec();
 }

--- a/examples/simple/simple.pro
+++ b/examples/simple/simple.pro
@@ -1,3 +1,5 @@
+include($$PWD/../examples_config.pri)
+
 SOURCES += main.cpp
 
 

--- a/src/sif/aerobutton.cpp
+++ b/src/sif/aerobutton.cpp
@@ -5,6 +5,9 @@
 #include <QPainter>
 #include <QApplication>
 
+namespace SIF {
+
+
 struct AeroButton::Private {
     bool hovered;
     bool pressed;
@@ -57,20 +60,36 @@ AeroButton::Private::~Private()
 AeroButton::AeroButton(QWidget * parent) 
     : QPushButton(parent), d(new Private)
 {
+    QPalette pal = palette();
+    pal.setBrush(QPalette::WindowText, Qt::white);
+    pal.setBrush(QPalette::Text, Qt::white);
+    pal.setBrush(QPalette::ButtonText, Qt::white);
+    setPalette(pal);
 }
 
 AeroButton::AeroButton(const QString & text, QWidget * parent) 
     : QPushButton(text, parent), d(new Private)
 {
+    QPalette pal = palette();
+    pal.setBrush(QPalette::WindowText, Qt::white);
+    pal.setBrush(QPalette::Text, Qt::white);
+    pal.setBrush(QPalette::ButtonText, Qt::white);
+    setPalette(pal);
 }
 
 AeroButton::AeroButton(const QIcon & icon, const QString & text, QWidget * parent) 
     : QPushButton(icon, text, parent), d(new Private)
 {
+    QPalette pal = palette();
+    pal.setBrush(QPalette::WindowText, Qt::white);
+    pal.setBrush(QPalette::Text, Qt::white);
+    pal.setBrush(QPalette::ButtonText, Qt::white);
+    setPalette(pal);
 }
 
 AeroButton::~AeroButton()
 {
+    delete d;
 }
 
 void AeroButton::setColor(const QColor &color) 
@@ -111,7 +130,11 @@ void AeroButton::paintEvent(QPaintEvent * pe)
 
     QPainter painter(this);  
     painter.setRenderHint(QPainter::Antialiasing); 
-
+    
+    painter.save();
+    
+    painter.fillRect(rect(), Qt::transparent);
+    
     //test for state changes
     QColor button_color;
     if(this->isEnabled())
@@ -147,7 +170,7 @@ void AeroButton::paintEvent(QPaintEvent * pe)
 
     QBrush brush(gradient);
     painter.setBrush(brush); 
-    painter.setPen(QPen(QBrush(button_color), 2.0));
+    painter.setPen(QPen(QBrush(button_color), 2.0, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin ));
 
     //main button
     QPainterPath painter_path;
@@ -159,17 +182,22 @@ void AeroButton::paintEvent(QPaintEvent * pe)
 
     //glass highlight
     painter.setBrush(QBrush(Qt::white));
-    painter.setPen(QPen(QBrush(Qt::white), 0.01));
+    painter.setPen(QPen(QBrush(Qt::white), 0.01, Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin));
     painter.setOpacity(0.30);
     painter.drawRect(1, 1, button_rect.width() - 2, (button_rect.height() / 2) - 2);
     
+    painter.restore();
+    
     //button text
     QString text = this->text();
     if(!text.isNull())
     {
         QFont font = this->font();
+        font.setBold(true);
         painter.setFont(font);
-        painter.setPen(Qt::white);
+        
+//         painter.setPen(Qt::white);
+        
         painter.setOpacity(1.0);
         painter.drawText(0, 0, button_rect.width(), button_rect.height(), Qt::AlignCenter, text);
     }
@@ -190,7 +218,7 @@ void AeroButton::enterEvent(QEvent * e)
     Q_UNUSED(e);
 
     d->hovered = true;
-    this->repaint();
+    this->update();
 }
 
 void AeroButton::leaveEvent(QEvent * e)
@@ -198,25 +226,28 @@ void AeroButton::leaveEvent(QEvent * e)
     Q_UNUSED(e);
 
     d->hovered = false;
-    this->repaint();
+    this->update();
 }
 
 void AeroButton::mousePressEvent(QMouseEvent * e)
 {
     Q_UNUSED(e);
-
-    this->click();
-
+    
     d->pressed = true;
-    this->repaint();
+    this->update();
+    
+    QPushButton::mousePressEvent(e);
 }
 
 void AeroButton::mouseReleaseEvent(QMouseEvent * e)
 {
     Q_UNUSED(e);
-
+    
     d->pressed = false;
-    this->repaint();
+    this->update();
+    
+    QPushButton::mouseReleaseEvent(e);
 }
 
 
+}

--- a/src/sif/aerobutton.h
+++ b/src/sif/aerobutton.h
@@ -3,7 +3,9 @@
 
 #include <QPushButton>
 
-class AeroButton : public QPushButton
+namespace SIF {
+
+class AeroButton : public QPushButton // TODO: QAbstractButton ?
 {
     Q_OBJECT
     
@@ -38,4 +40,8 @@ class AeroButton : public QPushButton
         Private *const d;
 };
 
-#endif // _AEROBUTTON_
+}
+
+#endif // _AEROBUTTON_H_
+
+

--- a/src/sif/mainwindow.cpp
+++ b/src/sif/mainwindow.cpp
@@ -17,18 +17,29 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #include "mainwindow.h"
 
+#include "private/centralwidget.h"
+
 namespace SIF {
 
+struct MainWindow::Private {
+    SIFPrivate::CentralWidget *central;
+};
+
 MainWindow::MainWindow(QWidget *parent)
- : QMainWindow(parent)
+ : QMainWindow(parent), d(new Private)
 {
+    d->central = new SIFPrivate::CentralWidget;
+    
+    
+    setCentralWidget(d->central);
 }
 
-
 MainWindow::~MainWindow()
 {
+    delete d;
 }
 
 

--- a/src/sif/mainwindow.h
+++ b/src/sif/mainwindow.h
@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef SIFMAINWINDOW_H
 #define SIFMAINWINDOW_H
 
@@ -34,7 +35,9 @@ class MainWindow : public QMainWindow
 		MainWindow(QWidget *parent = 0);
 		~MainWindow();
 		
-		
+    private:
+        struct Private;
+        Private *const d;
 };
 
 }

--- /dev/null
+++ b/src/sif/private/buttonarea.cpp
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by David Cuadrado                                  *
+ *   krawek@gmail.com                                                      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "buttonarea.h"
+
+#include <QHBoxLayout>
+
+#include "aerobutton.h"
+
+namespace SIFPrivate {
+
+ButtonArea::ButtonArea(QWidget *parent)
+ : QWidget(parent)
+{
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    
+    SIF::AeroButton *b1 = new SIF::AeroButton("Button 1");
+    b1->setRoundness(10);
+    
+    SIF::AeroButton *b2 = new SIF::AeroButton("Button 2");
+    b2->setRoundness(10);
+    
+    SIF::AeroButton *b3 = new SIF::AeroButton("Button 3");
+    b3->setRoundness(10);
+    
+    layout->addWidget(b1);
+    layout->addWidget(b2);
+    layout->addWidget(b3);
+}
+
+
+ButtonArea::~ButtonArea()
+{
+}
+
+
+}

--- /dev/null
+++ b/src/sif/private/buttonarea.h
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by David Cuadrado                                  *
+ *   krawek@gmail.com                                                      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef SIFPRIVATEBUTTONAREA_H
+#define SIFPRIVATEBUTTONAREA_H
+
+#include <QWidget>
+
+namespace SIFPrivate {
+
+/**
+	@author David Cuadrado <krawek@gmail.com>
+*/
+class ButtonArea : public QWidget
+{
+    Q_OBJECT;
+    public:
+        ButtonArea(QWidget *parent = 0);
+        ~ButtonArea();
+        
+    private:
+        
+};
+
+}
+
+#endif

--- /dev/null
+++ b/src/sif/private/centralwidget.cpp
@@ -0,0 +1,51 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by David Cuadrado                                  *
+ *   krawek@gmail.com                                                      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+
+#include "centralwidget.h"
+
+#include "headerwidget.h"
+#include "stackedwidget.h"
+
+#include <QVBoxLayout>
+
+namespace SIFPrivate {
+
+CentralWidget::CentralWidget(QWidget *parent)
+ : QWidget(parent)
+{
+    QVBoxLayout *layout = new QVBoxLayout(this);
+    layout->setMargin(0);
+    
+    m_header = new HeaderWidget;
+    m_stack = new StackedWidget;
+    
+    layout->addWidget(m_header);
+    layout->addWidget(m_stack);
+    
+    
+}
+
+
+CentralWidget::~CentralWidget()
+{
+}
+
+
+}

--- /dev/null
+++ b/src/sif/private/centralwidget.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by David Cuadrado                                  *
+ *   krawek@gmail.com                                                      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef SIFPRIVATECENTRALWIDGET_H
+#define SIFPRIVATECENTRALWIDGET_H
+
+#include <QWidget>
+
+namespace SIFPrivate {
+
+class HeaderWidget;
+class StackedWidget;
+
+/**
+	@author David Cuadrado <krawek@gmail.com>
+*/
+class CentralWidget : public QWidget
+{
+    Q_OBJECT;
+    public:
+        CentralWidget(QWidget *parent = 0);
+        ~CentralWidget();
+        
+    private:
+        HeaderWidget *m_header;
+        StackedWidget *m_stack;
+};
+
+}
+
+#endif

--- /dev/null
+++ b/src/sif/private/clickablelabel.cpp
@@ -0,0 +1,45 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by David Cuadrado                                  *
+ *   krawek@gmail.com                                                      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#include "clickablelabel.h"
+
+namespace SIFPrivate {
+
+ClickableLabel::ClickableLabel(QWidget *parent)
+ : QLabel(parent)
+{
+    setCursor(Qt::PointingHandCursor);
+}
+
+ClickableLabel::ClickableLabel(const QString &text, QWidget *parent) : QLabel(text, parent)
+{
+    setCursor(Qt::PointingHandCursor);
+}
+
+ClickableLabel::~ClickableLabel()
+{
+}
+
+void ClickableLabel::mouseReleaseEvent(QMouseEvent *e)
+{
+    QLabel::mouseReleaseEvent(e);
+    emit clicked();
+}
+
+}

--- /dev/null
+++ b/src/sif/private/clickablelabel.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by David Cuadrado                                  *
+ *   krawek@gmail.com                                                      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ ***************************************************************************/
+#ifndef SIFPRIVATECLICKABLELABEL_H
+#define SIFPRIVATECLICKABLELABEL_H
+
+#include <QLabel>
+
+namespace SIFPrivate {
+
+/**
+	@author David Cuadrado <krawek@gmail.com>
+*/
+class ClickableLabel : public QLabel
+{
+    Q_OBJECT;
+    public:
+        ClickableLabel(QWidget *parent = 0);
+        ClickableLabel(const QString &text, QWidget *parent = 0);
+        ~ClickableLabel();
+        
+    signals:
+        void clicked();
+        
+    protected:
+        void mouseReleaseEvent(QMouseEvent *e);
+};
+
+}
+
+#endif

--- /dev/null
+++ b/src/sif/private/headerwidget.cpp
@@ -0,0 +1,102 @@
+/***************************************************************************
+ *   Copyright (C) 2008 by David Cuadrado                                  *
+ *   krawek@gmail.com                                                      *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, o