diff --git a/src/widgets/atcoreinstancewidget.cpp b/src/widgets/atcoreinstancewidget.cpp
index 3b11bc5..56532ba 100644
--- a/src/widgets/atcoreinstancewidget.cpp
+++ b/src/widgets/atcoreinstancewidget.cpp
@@ -1,387 +1,388 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2017>
     Author: Lays Rodrigues - laysrodriguessilva@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 3 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, see <http://www.gnu.org/licenses/>.
 */
 
 #include "atcoreinstancewidget.h"
 #include "ui_atcoreinstancewidget.h"
 #include <QToolBar>
 #include <AtCore/SerialLayer>
 #include <AtCore/GCodeCommands>
 #include <KLocalizedString>
 #include "../dialogs/choosefiledialog.h"
 
 AtCoreInstanceWidget::AtCoreInstanceWidget(QWidget *parent):
     QWidget(parent),
     m_connected(false)
 {
     ui = new Ui::AtCoreInstanceWidget;
     ui->setupUi(this);
     
     ui->printProgressWidget->setVisible(false);
     buildMainToolbar();
     buildToolbar();
     setupConnections();
     initConnectsToAtCore();
     enableControls(false);
 }
 
 AtCoreInstanceWidget::~AtCoreInstanceWidget()
 {
     delete ui;
 }
 
 void AtCoreInstanceWidget::setupConnections(){
-
+    connect(ui->axisWidget, &AxisWidget::moveAxis, this, &AtCoreInstanceWidget::moveAxis);
 }
 
 void AtCoreInstanceWidget::buildToolbar()
 {
     toolBar = new QToolBar();
     //toolBar->setOrientation(Qt::Vertical);
     auto lb = new QAction;
     lb->setIcon(style()->standardIcon(QStyle::SP_DirHomeIcon));
     lb->setDisabled(true);
     toolBar->addAction(lb);
 
     auto homeAll = new QAction("All");
     connect(homeAll, &QAction::triggered, [=]{
        m_core.home();
     });
     toolBar->addAction(homeAll);
     
     for(auto homes : std::map<QString, int>{{"X", AtCore::X}, {"Y", AtCore::Y}, {"Z", AtCore::Z}}) {
         auto home = new QAction(homes.first);
         connect(home, &QAction::triggered, [this, &homes] {
             m_core.home(homes.second);
         });
         toolBar->addAction(home);
     }
 
     toolBar->addSeparator();
     
     auto axis = new QAction(i18n("Axis"));
     axis->setCheckable(true);
     axis->setChecked(true);
-    connect(axis, &QAction::toggled, ui->axisViewWidget, &AxisControl::setVisible);
+    connect(axis, &QAction::toggled, ui->axisWidget, &AxisWidget::setVisible);
     
     auto controls = new QAction(i18n("Controls"));
     controls->setCheckable(true);
     controls->setChecked(true);
     connect(controls, &QAction::toggled, ui->bedExtWidget, &BedExtruderWidget::setVisible);
     
     auto plot = new QAction(i18n("Temperature Plot"));
     plot->setCheckable(true);
     plot->setChecked(true);
     connect(plot, &QAction::toggled, ui->plotWidget, &PlotWidget::setVisible);
     
     toolBar->addAction(axis);
     toolBar->addAction(controls);
     toolBar->addAction(plot);
     ui->toolBarLayout->addWidget(toolBar);
     ui->toolBarLayout->addStretch();
 }
 
 QAction* AtCoreInstanceWidget::buildAction(QString name, bool checked, QIcon icon){
     auto action = new QAction(name);
     action->setCheckable(checked);
     action->setChecked(!checked);
     action->setIcon(icon);
     return action;
 }
 
 void AtCoreInstanceWidget::buildMainToolbar(){
     mainToolBar = new QToolBar();
     mainToolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
 
     auto disconnectAction = buildAction(i18n("Disconnect"), false, style()->standardIcon(QStyle::SP_DialogCloseButton));
     connect(this, &AtCoreInstanceWidget::disableDisconnect, disconnectAction, &QAction::setDisabled);
     connect(disconnectAction, &QAction::triggered, [=](){
         m_core.closeConnection();
         m_core.setState(AtCore::DISCONNECTED);
     });
     mainToolBar->addAction(disconnectAction);
 
     auto printAction = buildAction(i18n("Print"), true, style()->standardIcon(QStyle::SP_MediaPlay));
     connect(printAction, &QAction::triggered, [=](bool b){
         if(b){
             if(m_core.state() == AtCore::IDLE)
                 print();
             else
                 m_core.resume();
             printAction->setText(i18n("Pause"));
             printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPause));
         }else{
             pausePrint();
             printAction->setText(i18n("Resume Print"));
             printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
         }
     });
     mainToolBar->addAction(printAction);
 
     auto stopAction = buildAction(i18n("Stop"), false, style()->standardIcon(QStyle::SP_MediaStop));
     connect(stopAction, &QAction::triggered, this, &AtCoreInstanceWidget::stopPrint);
     connect(stopAction, &QAction::triggered, [=](){
         printAction->setText(i18n("Print"));
         printAction->setIcon(style()->standardIcon(QStyle::SP_MediaPlay));
         printAction->setChecked(false);
     });
     mainToolBar->addAction(stopAction);
 
     auto disableMotorsAction = buildAction(i18n("Disable Motors"), false, style()->standardIcon(QStyle::SP_MediaStop));
     connect(disableMotorsAction, &QAction::triggered, this, &AtCoreInstanceWidget::disableMotors);
     mainToolBar->addAction(disableMotorsAction);
 
     ui->mainToolBarLayout->addWidget(mainToolBar);
     ui->mainToolBarLayout->addStretch();
 }
 void AtCoreInstanceWidget::startConnection(QString serialPort, QMap<QString, QVariant> profiles){
     m_core.initSerial(serialPort, profiles["bps"].toInt());
     if(m_core.state() == AtCore::CONNECTING){
         QString fw = profiles["firmware"].toString();
         if( fw == QString("Auto-Detect")){
             m_core.detectFirmware();
         }else{
             m_core.loadFirmwarePlugin(fw);
         }
     }
 }
 
 void AtCoreInstanceWidget::initConnectsToAtCore()
 {
 
     // Handle AtCore status change
     connect(&m_core, &AtCore::stateChanged, this, &AtCoreInstanceWidget::handlePrinterStatusChanged);
 
     // If the number of extruders from the printer change, we need to update the radiobuttons on the widget
     connect(this, &AtCoreInstanceWidget::extruderCountChanged, ui->bedExtWidget, &BedExtruderWidget::setExtruderCount);
 
     // Bed and Extruder temperatures management
     connect(ui->bedExtWidget, &BedExtruderWidget::bedTemperatureChanged, &m_core, &AtCore::setBedTemp);
     connect(ui->bedExtWidget, &BedExtruderWidget::extTemperatureChanged, &m_core, &AtCore::setExtruderTemp);
 
     // Connect AtCore temperatures changes on Atelier Plot
     connect(&m_core.temperature(), &Temperature::bedTemperatureChanged, [ = ](float temp) {
         checkTemperature(0x00, 0, temp);
         ui->plotWidget->appendPoint(i18n("Actual Bed"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateBedTemp(temp);
     });
     connect(&m_core.temperature(), &Temperature::bedTargetTemperatureChanged, [ = ](float temp) {
         checkTemperature(0x01, 0, temp);
         ui->plotWidget->appendPoint(i18n("Target Bed"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateBedTargetTemp(temp);
     });
     connect(&m_core.temperature(), &Temperature::extruderTemperatureChanged, [ = ](float temp) {
         checkTemperature(0x02, 0, temp);
         ui->plotWidget->appendPoint(i18n("Actual Ext.1"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateExtTemp(temp);
     });
     connect(&m_core.temperature(), &Temperature::extruderTargetTemperatureChanged, [ = ](float temp) {
         checkTemperature(0x03, 0, temp);
         ui->plotWidget->appendPoint(i18n("Target Ext.1"), temp);
         ui->plotWidget->update();
         ui->bedExtWidget->updateExtTargetTemp(temp);
     });
 
     connect(ui->pushGCodeWidget, &PushGCodeWidget::push, [ = ](QString command) {
         ui->logWidget->addLog("Push " + command);
         m_core.pushCommand(command);
     });
 
     // Fan, Flow and Speed management
     connect(ui->ratesControlWidget, &RatesControlWidget::fanSpeedChanged, &m_core, &AtCore::setFanSpeed);
     connect(ui->ratesControlWidget, &RatesControlWidget::flowRateChanged, &m_core, &AtCore::setFlowRate);
     connect(ui->ratesControlWidget, &RatesControlWidget::printSpeedChanged, &m_core, &AtCore::setPrinterSpeed);
-    connect(ui->axisViewWidget, &AxisControl::clicked, this, &AtCoreInstanceWidget::axisControlClicked);
-
 }
 
 void AtCoreInstanceWidget::printFile(const QString& fileName)
 {
     if (!fileName.isEmpty() && (m_core.state() == AtCore::IDLE)) {
         m_core.print(fileName);
     }
 }
 
 void AtCoreInstanceWidget::print(){
     auto dialog = new ChooseFileDialog(this, m_files);
     if(dialog->exec() == QDialog::Accepted){
         printFile(dialog->choosenFile());
     }
 }
 void AtCoreInstanceWidget::pausePrint()
 {
     m_core.pause(QString());
 }
 
 void AtCoreInstanceWidget::stopPrint()
 {
     m_core.stop();
 }
 
 void AtCoreInstanceWidget::disableMotors()
 {
     m_core.pushCommand(GCode::toCommand(GCode::M18));
 }
 
 void AtCoreInstanceWidget::handlePrinterStatusChanged(AtCore::STATES newState)
 {
     QString stateString;
     switch (newState) {
         case AtCore::CONNECTING: {
             stateString = i18n("Connecting...");
             connect(&m_core, &AtCore::receivedMessage, this, &AtCoreInstanceWidget::checkReceivedCommand);
             connect(m_core.serial(), &SerialLayer::pushedCommand, this, &AtCoreInstanceWidget::checkPushedCommands);
         } break;
         case AtCore::IDLE: {
             stateString = i18n("Connected to ") + m_core.serial()->portName();
             emit extruderCountChanged(m_core.extruderCount());
             ui->logWidget->addLog(i18n("Serial connected"));
             emit disableDisconnect(false);
             setConnectedStatus(true);
         } break;
         case AtCore::DISCONNECTED: {
             stateString = i18n("Not Connected");
             disconnect(&m_core, &AtCore::receivedMessage, this, &AtCoreInstanceWidget::checkReceivedCommand);
             disconnect(m_core.serial(), &SerialLayer::pushedCommand, this, &AtCoreInstanceWidget::checkPushedCommands);
             ui->logWidget->addLog(i18n("Serial disconnected"));
             ui->printProgressWidget->setHidden(true);
             setConnectedStatus(false);
         } break;
         case AtCore::STARTPRINT: {
             stateString = i18n("Starting Print");
             ui->printProgressWidget->setVisible(true);
             connect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar);
         } break;
         case AtCore::FINISHEDPRINT: {
             stateString = i18n("Finished Print");
             ui->printProgressWidget->setVisible(false);
             disconnect(&m_core, &AtCore::printProgressChanged, ui->printProgressWidget, &PrintProgressWidget::updateProgressBar);
         } break;
         case AtCore::BUSY: {
             stateString = i18n("Printing");
             emit disableDisconnect(true);
         } break;
         case AtCore::PAUSE: {
             stateString = i18n("Paused");
         } break;
         case AtCore::STOP: {
             stateString = i18n("Stoping Print");
             ui->printProgressWidget->setHidden(true);
         } break;
         case AtCore::ERRORSTATE: {
             stateString = i18n("Error");
         } break;
     }
      ui->lblState->setText(stateString);
 }
 
 void AtCoreInstanceWidget::checkTemperature(uint sensorType, uint number, uint temp)
 {
     QString msg;
     switch (sensorType) {
     case 0x00: // bed
         msg = QString::fromLatin1("Bed Temperature ");
         break;
 
     case 0x01: // bed target
         msg = QString::fromLatin1("Bed Target Temperature ");
         break;
 
     case 0x02: // extruder
         msg = QString::fromLatin1("Extruder Temperature ");
         break;
 
     case 0x03: // extruder target
         msg = QString::fromLatin1("Extruder Target Temperature ");
         break;
 
     case 0x04: // enclosure
         msg = QString::fromLatin1("Enclosure Temperature ");
         break;
 
     case 0x05: // enclosure target
         msg = QString::fromLatin1("Enclosure Target Temperature ");
         break;
     }
 
     msg.append(QString::fromLatin1("[%1] : %2"));
     msg = msg.arg(QString::number(number))
           .arg(QString::number(temp));
 
     ui->logWidget->addRLog(msg);
 }
 
 void AtCoreInstanceWidget::checkReceivedCommand(const QByteArray &message)
 {
     ui->logWidget->addRLog(QString::fromUtf8(message));
 }
 
 void AtCoreInstanceWidget::checkPushedCommands(QByteArray bmsg)
 {
     QString msg = QString::fromUtf8(bmsg);
     QRegExp _newLine(QChar::fromLatin1('\n'));
     QRegExp _return(QChar::fromLatin1('\r'));
     msg.replace(_newLine, QStringLiteral("\\n"));
     msg.replace(_return, QStringLiteral("\\r"));
     ui->logWidget->addSLog(msg);
 }
 
 void AtCoreInstanceWidget::axisControlClicked(QChar axis, int value)
 {
     m_core.setRelativePosition();
     m_core.pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axis, QString::number(value))));
     m_core.setAbsolutePosition();
 }
 
 void AtCoreInstanceWidget::enableControls(bool b)
 {
     ui->mainTab->setEnabled(b);
     mainToolBar->setEnabled(b);
     toolBar->setEnabled(b);
 }
 
 bool AtCoreInstanceWidget::connected()
 {
     return m_connected;
 }
 
 void AtCoreInstanceWidget::setConnectedStatus(bool b)
 {
     m_connected = b;
     enableControls(b);
 }
 
 void AtCoreInstanceWidget::setOpenFiles(QList<QUrl> files)
 {
     m_files = files;
 }
 
 const QStringList AtCoreInstanceWidget::baudRates()
 {
     return m_core.portSpeeds();
 }
 
 const QStringList AtCoreInstanceWidget::firmwares()
 {
     return m_core.availableFirmwarePlugins();
 }
 
-
-
+void AtCoreInstanceWidget::moveAxis(QChar axes, int value){
+    m_core.setRelativePosition();
+    m_core.pushCommand(GCode::toCommand(GCode::G1, QStringLiteral("%1%2").arg(axes, QString::number(value))));
+    m_core.setAbsolutePosition();
+}
diff --git a/src/widgets/atcoreinstancewidget.h b/src/widgets/atcoreinstancewidget.h
index e217fcb..517e9d8 100644
--- a/src/widgets/atcoreinstancewidget.h
+++ b/src/widgets/atcoreinstancewidget.h
@@ -1,82 +1,83 @@
 /* Atelier KDE Printer Host for 3D Printing
     Copyright (C) <2017>
     Author: Lays Rodrigues - laysrodriguessilva@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 3 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, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
 #include <QWidget>
 #include <QUrl>
 #include <QToolBar>
 #include <AtCore/AtCore>
 
 namespace Ui
 {
 class AtCoreInstanceWidget;
 }
 
 /**
  * @todo write docs
  */
 class AtCoreInstanceWidget : public QWidget
 {
     Q_OBJECT
 
 public:
     /**
      * Default constructor
      */
     AtCoreInstanceWidget(QWidget* parent = nullptr);
 
     /**
      * Destructor
      */
     ~AtCoreInstanceWidget();
     void startConnection(QString serialPort, QMap<QString, QVariant> profiles);
     bool connected();
     void setOpenFiles(QList<QUrl> files);
     const QStringList baudRates();
     const QStringList firmwares();
     
 private:
     Ui::AtCoreInstanceWidget* ui;
     AtCore m_core;
     QToolBar *toolBar;
     QToolBar *mainToolBar;
     QList<QUrl> m_files;
     bool m_connected;
     void setupConnections();
     void initConnectsToAtCore();
     void printFile(const QString& fileName);
     void pausePrint();
     void stopPrint();
     void disableMotors();
     void checkReceivedCommand(const QByteArray &message);
     void checkPushedCommands(QByteArray bmsg);
     void handlePrinterStatusChanged(AtCore::STATES newState);
     void checkTemperature(uint sensorType, uint number, uint temp);
     void axisControlClicked(QChar axis, int value);
     void enableControls(bool b);
     void buildToolbar();
     void buildMainToolbar();
     void setConnectedStatus(bool b);
     void print();
     QAction* buildAction(QString name, bool checked, QIcon icon=QIcon());
+    void moveAxis(QChar axes, int value);
     
     
 signals:
     void extruderCountChanged(int count);
     void disableDisconnect(bool b);
 };
diff --git a/src/widgets/atcoreinstancewidget.ui b/src/widgets/atcoreinstancewidget.ui
index faecd0a..eeea073 100644
--- a/src/widgets/atcoreinstancewidget.ui
+++ b/src/widgets/atcoreinstancewidget.ui
@@ -1,140 +1,145 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>AtCoreInstanceWidget</class>
  <widget class="QWidget" name="AtCoreInstanceWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>483</width>
-    <height>362</height>
+    <width>425</width>
+    <height>304</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <layout class="QHBoxLayout" name="mainToolBarLayout"/>
    </item>
    <item>
     <layout class="QHBoxLayout" name="toolBarLayout"/>
    </item>
    <item>
     <widget class="QTabWidget" name="mainTab">
      <property name="currentIndex">
       <number>0</number>
      </property>
      <widget class="QWidget" name="tabWidgetPage1">
       <attribute name="title">
        <string>Controllers</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3">
-       <item row="2" column="2">
-        <widget class="AxisControl" name="axisViewWidget"/>
+      <layout class="QVBoxLayout" name="verticalLayout">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="BedExtruderWidget" name="bedExtWidget" native="true"/>
+         </item>
+         <item>
+          <widget class="AxisWidget" name="axisWidget" native="true"/>
+         </item>
+        </layout>
        </item>
-       <item row="3" column="0" colspan="4">
+       <item>
         <widget class="PlotWidget" name="plotWidget" native="true"/>
        </item>
-       <item row="4" column="0" colspan="4">
+       <item>
         <widget class="PrintProgressWidget" name="printProgressWidget" native="true"/>
        </item>
-       <item row="2" column="1">
-        <widget class="BedExtruderWidget" name="bedExtWidget" native="true"/>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="advancedTab">
       <attribute name="title">
        <string>Advanced</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="2" column="0">
         <widget class="LogWidget" name="logWidget" native="true"/>
        </item>
        <item row="1" column="0">
         <widget class="PushGCodeWidget" name="pushGCodeWidget" native="true"/>
        </item>
        <item row="0" column="0">
         <widget class="RatesControlWidget" name="ratesControlWidget" native="true"/>
        </item>
       </layout>
      </widget>
     </widget>
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
       <widget class="QLabel" name="label_2">
        <property name="text">
         <string>Printer Status:</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLabel" name="lblState">
        <property name="text">
         <string/>
        </property>
       </widget>
      </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
        <property name="sizeHint" stdset="0">
         <size>
          <width>40</width>
          <height>20</height>
         </size>
        </property>
       </spacer>
      </item>
     </layout>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>PlotWidget</class>
    <extends>QWidget</extends>
    <header>plotwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>PrintProgressWidget</class>
    <extends>QWidget</extends>
    <header>printprogresswidget.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>AxisControl</class>
-   <extends>QGraphicsView</extends>
-   <header>axiscontrol.h</header>
-  </customwidget>
   <customwidget>
    <class>BedExtruderWidget</class>
    <extends>QWidget</extends>
    <header>bedextruderwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>LogWidget</class>
    <extends>QWidget</extends>
    <header>logwidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>PushGCodeWidget</class>
    <extends>QWidget</extends>
    <header>pushgcodewidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>RatesControlWidget</class>
    <extends>QWidget</extends>
    <header>ratescontrolwidget.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>AxisWidget</class>
+   <extends>QWidget</extends>
+   <header>axiswidget.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>
 </ui>