--- a/examples/simple/main.cpp
+++ b/examples/simple/main.cpp
@@ -19,6 +19,8 @@
  ***************************************************************************/
 
 #include <QApplication>
+#include <QLabel>
+#include <QIcon>
 
 #include "sif/mainwindow.h"
 
@@ -27,6 +29,12 @@ int main(int argc, char **argv)
 	QApplication app(argc, argv);
 	
 	SIF::MainWindow mw;
+	
+    mw.addPage("Page 1", new QLabel("La pagina 1"));
+    mw.addPage("Page 2", new QLabel("La pagina 2"));
+    mw.addPage(QIcon("/usr/share/icons/gnome/48x48/apps/openofficeorg23-base.png"), "Page 2", new QLabel("La pagina 3"));
+    mw.addPage(QIcon("/usr/share/icons/crystalsvg/128x128/apps/tux.png"), QString(), new QLabel("La pagina 4"));
+    
     mw.show();
 	
 	return app.exec();

--- a/src/sif/aerobutton.cpp
+++ b/src/sif/aerobutton.cpp
@@ -4,13 +4,13 @@
 
 #include <QPainter>
 #include <QApplication>
+#include <QStyleOptionButton>
 
 namespace SIF {
 
 
 struct AeroButton::Private {
     bool hovered;
-    bool pressed;
 
     QColor color;
     QColor highlight;
@@ -20,20 +20,26 @@ struct AeroButton::Private {
 
     int roundness;
     
-    Private();
+    Private(AeroButton *q);
     ~Private();
     
     QRect calculateIconPosition(const QRect &button_rect, const QSize &icon_size);
 };
 
-AeroButton::Private::Private() : hovered(false), 
-    pressed(false), 
+AeroButton::Private::Private(AeroButton *q) : hovered(false),
     color(Qt::gray),
     highlight(Qt::lightGray),
     shadow(Qt::black),
     opacity(1.0),
     roundness(0)
 {
+    QPalette pal = q->palette();
+    pal.setBrush(QPalette::WindowText, Qt::white);
+    pal.setBrush(QPalette::Text, Qt::white);
+    pal.setBrush(QPalette::ButtonText, Qt::white);
+    q->setPalette(pal);
+    
+    q->setCheckable(1);
 }
 
 QRect AeroButton::Private::calculateIconPosition(const QRect &button_rect, const QSize &icon_size)
@@ -43,11 +49,7 @@ QRect AeroButton::Private::calculateIconPosition(const QRect &button_rect, const
     int width = icon_size.width(); 
     int height = icon_size.height();
 
-    QRect icon_position;
-    icon_position.setX(x);
-    icon_position.setY(y);
-    icon_position.setWidth(width);
-    icon_position.setHeight(height);
+    QRect icon_position(x, y, width, height);
 
     return icon_position;
 }
@@ -58,33 +60,18 @@ AeroButton::Private::~Private()
 
 
 AeroButton::AeroButton(QWidget * parent) 
-    : QPushButton(parent), d(new Private)
+    : QPushButton(parent), d(new Private(this))
 {
-    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)
+    : QPushButton(text, parent), d(new Private(this))
 {
-    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)
+    : QPushButton(icon, text, parent), d(new Private(this))
 {
-    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()
@@ -127,13 +114,17 @@ void AeroButton::setRoundness(int roundness)
 void AeroButton::paintEvent(QPaintEvent * pe)
 {
     Q_UNUSED(pe);
+    
+    QRect rect = this->rect();
+    QStyleOptionButton option;
+    initStyleOption(&option);
 
     QPainter painter(this);  
     painter.setRenderHint(QPainter::Antialiasing); 
     
     painter.save();
     
-    painter.fillRect(rect(), Qt::transparent);
+    painter.fillRect(rect, Qt::transparent);
     
     //test for state changes
     QColor button_color;
@@ -141,7 +132,7 @@ void AeroButton::paintEvent(QPaintEvent * pe)
     {
         d->hovered ? button_color = d->highlight : button_color = d->color;
 
-        if(d->pressed)
+        if(option.state & QStyle::State_Sunken )
         {
             button_color = d->highlight.darker(250);
         }
@@ -188,28 +179,51 @@ void AeroButton::paintEvent(QPaintEvent * pe)
     
     painter.restore();
     
-    //button text
+    QIcon icon = this->icon();
     QString text = this->text();
+    QRect icon_position;
+    
+    //icon
+    if(!icon.isNull())
+    {
+        QSize icon_size = this->iconSize();
+        icon_position = d->calculateIconPosition(button_rect, icon_size);
+        
+        
+        if( !text.isEmpty() )
+        {
+            icon_position.setX(20);
+            icon_position.setWidth(icon_size.width());
+        }
+        
+        painter.setOpacity(1.0);
+        painter.drawPixmap(icon_position, QPixmap(icon.pixmap(icon_size)));
+    }
+    
+    //button text
+    
     if(!text.isNull())
     {
         QFont font = this->font();
         font.setBold(true);
         painter.setFont(font);
         
-//         painter.setPen(Qt::white);
-        
         painter.setOpacity(1.0);
-        painter.drawText(0, 0, button_rect.width(), button_rect.height(), Qt::AlignCenter, text);
+        painter.drawText(icon_position.width(), 0, button_rect.width() - icon_position.width(), button_rect.height(), Qt::AlignCenter, text);
     }
-
-    //icon
-    QIcon icon = this->icon();
-    if(!icon.isNull())
+    
+    if(option.state & QStyle::State_On)
     {
-        QSize icon_size = this->iconSize();
-        QRect icon_position = d->calculateIconPosition(button_rect, icon_size);
-        painter.setOpacity(1.0);
-        painter.drawPixmap(icon_position, QPixmap(icon.pixmap(icon_size)));
+        QPen old = painter.pen();
+        
+        QColor h = d->highlight;
+        h.setAlpha(150);
+        QPen pen(h, 2);
+        painter.setPen(pen);
+        
+        painter.drawLine(rect.bottomLeft()-QPoint(-6, 3), rect.bottomRight()-QPoint(6, 3));
+            
+        painter.setPen(old);
     }
 }
 
@@ -233,7 +247,6 @@ void AeroButton::mousePressEvent(QMouseEvent * e)
 {
     Q_UNUSED(e);
     
-    d->pressed = true;
     this->update();
     
     QPushButton::mousePressEvent(e);
@@ -243,7 +256,6 @@ void AeroButton::mouseReleaseEvent(QMouseEvent * e)
 {
     Q_UNUSED(e);
     
-    d->pressed = false;
     this->update();
     
     QPushButton::mouseReleaseEvent(e);

--- a/src/sif/mainwindow.cpp
+++ b/src/sif/mainwindow.cpp
@@ -42,5 +42,14 @@ MainWindow::~MainWindow()
     delete d;
 }
 
+void MainWindow::addPage(const QString &title, QWidget *w)
+{
+    d->central->addPage(title, w);
+}
+
+void MainWindow::addPage(const QIcon &icon, const QString &title, QWidget *w)
+{
+    d->central->addPage(icon, title, w);
+}
 
 }

--- a/src/sif/mainwindow.h
+++ b/src/sif/mainwindow.h
@@ -34,6 +34,9 @@ class MainWindow : public QMainWindow
 	public:
 		MainWindow(QWidget *parent = 0);
 		~MainWindow();
+        
+        void addPage(const QString &title, QWidget *w);
+        void addPage(const QIcon &icon, const QString &title, QWidget *w);
 		
     private:
         struct Private;

--- a/src/sif/private/buttonarea.cpp
+++ b/src/sif/private/buttonarea.cpp
@@ -27,22 +27,10 @@
 namespace SIFPrivate {
 
 ButtonArea::ButtonArea(QWidget *parent)
- : QWidget(parent)
+ : QWidget(parent), m_buttons(this)
 {
-    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);
+    m_layout = new QHBoxLayout(this);
+    setExclusive(true);
 }
 
 
@@ -50,5 +38,27 @@ ButtonArea::~ButtonArea()
 {
 }
 
+void ButtonArea::setExclusive(bool e)
+{
+    m_buttons.setExclusive(e);
+}
+
+bool ButtonArea::exclusive() const
+{
+    return m_buttons.exclusive();
+}
+
+
+SIF::AeroButton *ButtonArea::addButton(const QString &title, const QIcon &icon)
+{
+    SIF::AeroButton *button = new SIF::AeroButton(icon, title);
+    button->setIconSize(QSize(48, 48));
+    
+    m_layout->addWidget(button);
+    
+    m_buttons.addButton(button);
+    
+    return button;
+}
 
 }

--- a/src/sif/private/buttonarea.h
+++ b/src/sif/private/buttonarea.h
@@ -21,6 +21,14 @@
 #define SIFPRIVATEBUTTONAREA_H
 
 #include <QWidget>
+#include <QIcon>
+#include <QButtonGroup>
+
+class QHBoxLayout;
+
+namespace SIF {
+class AeroButton;
+}
 
 namespace SIFPrivate {
 
@@ -34,8 +42,14 @@ class ButtonArea : public QWidget
         ButtonArea(QWidget *parent = 0);
         ~ButtonArea();
         
-    private:
+        void setExclusive(bool e);
+        bool exclusive() const;
+        
+        SIF::AeroButton *addButton(const QString &title, const QIcon &icon = QIcon());
         
+    private:
+        QHBoxLayout *m_layout;
+        QButtonGroup m_buttons;
 };
 
 }

--- a/src/sif/private/centralwidget.cpp
+++ b/src/sif/private/centralwidget.cpp
@@ -22,6 +22,7 @@
 
 #include "headerwidget.h"
 #include "stackedwidget.h"
+#include "aerobutton.h"
 
 #include <QVBoxLayout>
 
@@ -47,5 +48,39 @@ CentralWidget::~CentralWidget()
 {
 }
 
+void CentralWidget::addPage(const QString &title, QWidget *w)
+{
+    SIF::AeroButton *button = m_header->addButton(title);
+    m_stack->addWidget(w);
+    
+    m_pages[button] = w;
+    
+    connect(button, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
+}
 
+void CentralWidget::addPage(const QIcon &icon, const QString &title, QWidget *w)
+{
+    SIF::AeroButton *button = m_header->addButton(title, icon);
+    m_stack->addWidget(w);
+    
+    m_pages[button] = w;
+    
+    connect(button, SIGNAL(clicked()), this, SLOT(onButtonClicked()));
 }
+
+void CentralWidget::onButtonClicked()
+{
+    QAbstractButton *button = qobject_cast<QAbstractButton *>(sender());
+    
+    if(button)
+    {
+        if(m_pages.contains(button))
+        {
+            m_stack->setCurrentWidget(m_pages[button]);
+        }
+    }
+}
+
+}
+
+

--- a/src/sif/private/centralwidget.h
+++ b/src/sif/private/centralwidget.h
@@ -21,6 +21,9 @@
 #define SIFPRIVATECENTRALWIDGET_H
 
 #include <QWidget>
+#include <QHash>
+
+class QAbstractButton;
 
 namespace SIFPrivate {
 
@@ -37,9 +40,17 @@ class CentralWidget : public QWidget
         CentralWidget(QWidget *parent = 0);
         ~CentralWidget();
         
+        void addPage(const QString &title, QWidget *w);
+        void addPage(const QIcon &icon, const QString &title, QWidget *w);
+        
+    private slots:
+        void onButtonClicked();
+        
     private:
         HeaderWidget *m_header;
         StackedWidget *m_stack;
+        
+        QHash<QAbstractButton *, QWidget *> m_pages;
 };
 
 }

--- a/src/sif/private/headerwidget.cpp
+++ b/src/sif/private/headerwidget.cpp
@@ -22,6 +22,8 @@
 #include "buttonarea.h"
 #include "clickablelabel.h"
 
+#include "aerobutton.h"
+
 #include <QLinearGradient>
 #include <QHBoxLayout>
 
@@ -79,6 +81,14 @@ void HeaderWidget::setFontColor(const QColor &color)
     m_title->setPalette(palette);
 }
 
+SIF::AeroButton *HeaderWidget::addButton(const QString &title, const QIcon &icon)
+{
+    SIF::AeroButton *button = m_buttonArea->addButton(title, icon);
+    
+    
+    return button;
+}
+
 void HeaderWidget::resizeEvent(QResizeEvent *e)
 {
     QWidget::resizeEvent(e);

--- a/src/sif/private/headerwidget.h
+++ b/src/sif/private/headerwidget.h
@@ -21,6 +21,11 @@
 #define SIFPRIVATEHEADERWIDGET_H
 
 #include <QWidget>
+#include <QIcon>
+
+namespace SIF {
+    class AeroButton;
+}
 
 namespace SIFPrivate {
 
@@ -44,6 +49,8 @@ class HeaderWidget : public QWidget
         
         void setFontColor(const QColor &color);
         
+        SIF::AeroButton *addButton(const QString &title, const QIcon &icon = QIcon());
+        
     signals:
         void titleClicked();