diff --git a/src/GUI/IntelliPhotoGui.cpp b/src/GUI/IntelliPhotoGui.cpp
index 3429864..0c9a620 100644
--- a/src/GUI/IntelliPhotoGui.cpp
+++ b/src/GUI/IntelliPhotoGui.cpp
@@ -8,466 +8,460 @@
 
 // IntelliPhotoGui constructor
 IntelliPhotoGui::IntelliPhotoGui(){
-    // create Gui elements and lay them out
-    createGui();
-    // Create actions
-    createActions();
-    // create Menus
-    createMenus();
-    // set style of the gui
-    setIntelliStyle();
-    // Size the app
-    showMaximized();
+		// create Gui elements and lay them out
+		createGui();
+		// Create actions
+		createActions();
+		// create Menus
+		createMenus();
+		// set style of the gui
+		setIntelliStyle();
+		// Size the app
+		resize(600,600);
+		showMaximized();
+
 }
 
 // User tried to close the app
-void IntelliPhotoGui::closeEvent(QCloseEvent *event){
-    // If they try to close maybeSave() returns true
-    // if no changes have been made and the app closes
-    if (maybeSave()) {
-        event->accept();
-    } else {
-        // If there have been changes ignore the event
-        event->ignore();
-    }
+void IntelliPhotoGui::closeEvent(QCloseEvent*event){
+		// If they try to close maybeSave() returns true
+		// if no changes have been made and the app closes
+		if (maybeSave()) {
+				event->accept();
+		} else {
+				// If there have been changes ignore the event
+				event->ignore();
+		}
 }
 
 // Check if the current image has been changed and then
 // open a dialog to open a file
 void IntelliPhotoGui::slotOpen(){
-    // Check if changes have been made since last save
-    // maybeSave() returns true if no changes have been made
-    if (maybeSave()) {
+		// Check if changes have been made since last save
+		// maybeSave() returns true if no changes have been made
+		if (maybeSave()) {
 
-        // Get the file to open from a dialog
-        // tr sets the window title to Open File
-        // QDir opens the current dirctory
-        QString fileName = QFileDialog::getOpenFileName(this,
-                                   tr("Open File"), QDir::currentPath(), nullptr, nullptr, QFileDialog::DontUseNativeDialog);
+				// Get the file to open from a dialog
+				// tr sets the window title to Open File
+				// QDir opens the current dirctory
+				QString fileName = QFileDialog::getOpenFileName(this,
+				                                                tr("Open File"), QDir::currentPath(), nullptr, nullptr, QFileDialog::DontUseNativeDialog);
 
-        // If we have a file name load the image and place
-        // it in the paintingArea
-        if (!fileName.isEmpty())
-            paintingArea->open(fileName);
-    }
+				// If we have a file name load the image and place
+				// it in the paintingArea
+				if (!fileName.isEmpty())
+						paintingArea->open(fileName);
+		}
 }
 
 // Called when the user clicks Save As in the menu
 void IntelliPhotoGui::slotSave(){
-    // A QAction represents the action of the user clicking
-    QAction *action = qobject_cast<QAction *>(sender());
+		// A QAction represents the action of the user clicking
+		QAction*action = qobject_cast<QAction*>(sender());
 
-    // Stores the array of bytes of the users data
-    QByteArray fileFormat = action->data().toByteArray();
+		// Stores the array of bytes of the users data
+		QByteArray fileFormat = action->data().toByteArray();
 
-    // Pass it to be saved
-    saveFile(fileFormat);
+		// Pass it to be saved
+		saveFile(fileFormat);
 }
 
 // Opens a dialog that allows the user to create a New Layer
 void IntelliPhotoGui::slotCreateNewLayer(){
-    // Stores button value
-    bool ok1, ok2;
+		// Stores button value
+		bool ok1, ok2;
 
-    // "New Layer" is the title of the window
-    // the next tr is the text to display
-    // Define the standard Value, min, max, step and ok button
-    int width = QInputDialog::getInt(this, tr("New Layer"),
-                                        tr("Width:"),
-                                        200,1, 500, 1, &ok1);
-    int height = QInputDialog::getInt(this, tr("New Layer"),
-                                        tr("Height:"),
-                                        200,1, 500, 1, &ok2);
-    // Create New Layer
-    if (ok1&&ok2)
-    {
-        int layer = paintingArea->addLayer(width,height,0,0);
-        paintingArea->slotActivateLayer(layer);
-    }
+		// "New Layer" is the title of the window
+		// the next tr is the text to display
+		// Define the standard Value, min, max, step and ok button
+		int width = QInputDialog::getInt(this, tr("New Layer"),
+		                                 tr("Width:"),
+		                                 200,1, 500, 1, &ok1);
+		int height = QInputDialog::getInt(this, tr("New Layer"),
+		                                  tr("Height:"),
+		                                  200,1, 500, 1, &ok2);
+		// Create New Layer
+		if (ok1&&ok2)
+		{
+				int layer = paintingArea->addLayer(width,height,0,0);
+				paintingArea->slotActivateLayer(layer);
+		}
 }
 
 // Opens a dialog that allows the user to delete a Layer
 void IntelliPhotoGui::slotDeleteLayer(){
-    // Stores button value
-    bool ok;
-
-    // "delete Layer" is the title of the window
-    // the next tr is the text to display
-    // Define the standard Value, min, max, step and ok button
-    int layerNumber = QInputDialog::getInt(this, tr("delete Layer"),
-                                        tr("Number:"),
-                                        1,0, 500, 1, &ok);
-    // Create New Layer
-    if (ok)
-        paintingArea->deleteLayer(layerNumber);
-}
-
-void slotCreatePenTool(){
-
-}
-
-void slotCreateFloodFillTool(){
+		// Stores button value
+		bool ok;
 
+		// "delete Layer" is the title of the window
+		// the next tr is the text to display
+		// Define the standard Value, min, max, step and ok button
+		int layerNumber = QInputDialog::getInt(this, tr("delete Layer"),
+		                                       tr("Number:"),
+		                                       1,0, 500, 1, &ok);
+		// Create New Layer
+		if (ok)
+				paintingArea->deleteLayer(layerNumber);
 }
 
 void IntelliPhotoGui::slotSetActiveAlpha(){
-    // Stores button value
-    bool ok1, ok2;
+		// Stores button value
+		bool ok1, ok2;
 
-    // "Layer to set on" is the title of the window
-    // the next tr is the text to display
-    // Define the standard Value, min, max, step and ok button
-    int layer = QInputDialog::getInt(this, tr("Layer to set on"),
-                                        tr("Layer:"),
-                                        -1,-1,100,1, &ok1);
-    // "New Alpha" is the title of the window
-    int alpha = QInputDialog::getInt(this, tr("New Alpha"),
-                                        tr("Alpha:"),
-                                        255,0, 255, 1, &ok2);
-    if (ok1&&ok2)
-    {
-        paintingArea->setAlphaOfLayer(layer,alpha);
-    }
+		// "Layer to set on" is the title of the window
+		// the next tr is the text to display
+		// Define the standard Value, min, max, step and ok button
+		int layer = QInputDialog::getInt(this, tr("Layer to set on"),
+		                                 tr("Layer:"),
+		                                 -1,-1,100,1, &ok1);
+		// "New Alpha" is the title of the window
+		int alpha = QInputDialog::getInt(this, tr("New Alpha"),
+		                                 tr("Alpha:"),
+		                                 255,0, 255, 1, &ok2);
+		if (ok1&&ok2)
+		{
+				paintingArea->setAlphaOfLayer(layer,alpha);
+		}
 }
 
 void IntelliPhotoGui::slotPositionMoveUp(){
-    paintingArea->movePositionActive(0,-20);
-    update();
+		paintingArea->movePositionActive(0,-20);
+		update();
 }
 
 void IntelliPhotoGui::slotPositionMoveDown(){
-    paintingArea->movePositionActive(0,20);
-    update();
+		paintingArea->movePositionActive(0,20);
+		update();
 }
 
 void IntelliPhotoGui::slotPositionMoveLeft(){
-    paintingArea->movePositionActive(-20,0);
-    update();
+		paintingArea->movePositionActive(-20,0);
+		update();
 }
 
 void IntelliPhotoGui::slotPositionMoveRight(){
-    paintingArea->movePositionActive(20,0);
-    update();
+		paintingArea->movePositionActive(20,0);
+		update();
 }
 
 void IntelliPhotoGui::slotMoveLayerUp(){
-    paintingArea->moveActiveLayer(1);
-    update();
+		paintingArea->moveActiveLayer(1);
+		update();
 }
 
 void IntelliPhotoGui::slotMoveLayerDown(){
-    paintingArea->moveActiveLayer(-1);
-    update();
+		paintingArea->moveActiveLayer(-1);
+		update();
 }
 
 void IntelliPhotoGui::slotClearActiveLayer(){
-    // Stores button value
-    bool ok1, ok2, ok3, ok4;
+		// Stores button value
+		bool ok1, ok2, ok3, ok4;
 
-    // "Red Input" is the title of the window
-    // the next tr is the text to display
-    // Define the standard Value, min, max, step and ok button
-    int red = QInputDialog::getInt(this, tr("Red Input"),
-                                        tr("Red:"),
-                                        255,0, 255,1, &ok1);
-    // "Green Input" is the title of the window
-    int green = QInputDialog::getInt(this, tr("Green Input"),
-                                        tr("Green:"),
-                                        255,0, 255, 1, &ok2);
-    // "Blue Input" is the title of the window
-    int blue = QInputDialog::getInt(this, tr("Blue Input"),
-                                        tr("Blue:"),
-                                        255,0, 255, 1, &ok3);
-    // "Alpha Input" is the title of the window
-    int alpha = QInputDialog::getInt(this, tr("Alpha Input"),
-                                        tr("Alpha:"),
-                                        255,0, 255, 1, &ok4);
-    if (ok1&&ok2&&ok3&&ok4)
-    {
-        paintingArea->floodFill(red, green, blue, alpha);
-    }
+		// "Red Input" is the title of the window
+		// the next tr is the text to display
+		// Define the standard Value, min, max, step and ok button
+		int red = QInputDialog::getInt(this, tr("Red Input"),
+		                               tr("Red:"),
+		                               255,0, 255,1, &ok1);
+		// "Green Input" is the title of the window
+		int green = QInputDialog::getInt(this, tr("Green Input"),
+		                                 tr("Green:"),
+		                                 255,0, 255, 1, &ok2);
+		// "Blue Input" is the title of the window
+		int blue = QInputDialog::getInt(this, tr("Blue Input"),
+		                                tr("Blue:"),
+		                                255,0, 255, 1, &ok3);
+		// "Alpha Input" is the title of the window
+		int alpha = QInputDialog::getInt(this, tr("Alpha Input"),
+		                                 tr("Alpha:"),
+		                                 255,0, 255, 1, &ok4);
+		if (ok1&&ok2&&ok3&&ok4)
+		{
+				paintingArea->floodFill(red, green, blue, alpha);
+		}
 }
 
 void IntelliPhotoGui::slotSetActiveLayer(){
-    // Stores button value
-    bool ok1;
+		// Stores button value
+		bool ok1;
 
-    // "Layer to set on" is the title of the window
-    // the next tr is the text to display
-    // Define the standard Value, min, max, step and ok button
-    int layer = QInputDialog::getInt(this, tr("Layer to set on"),
-                                        tr("Layer:"),
-                                        -1,0,255,1, &ok1);
-    if (ok1)
-    {
-        paintingArea->setLayerToActive(layer);
-    }
-};
+		// "Layer to set on" is the title of the window
+		// the next tr is the text to display
+		// Define the standard Value, min, max, step and ok button
+		int layer = QInputDialog::getInt(this, tr("Layer to set on"),
+		                                 tr("Layer:"),
+		                                 -1,0,255,1, &ok1);
+		if (ok1)
+		{
+				paintingArea->setLayerToActive(layer);
+		}
+}
 
 void IntelliPhotoGui::slotSetFirstColor(){
-    paintingArea->colorPickerSetFirstColor();
+		paintingArea->colorPickerSetFirstColor();
 }
 
 void IntelliPhotoGui::slotSetSecondColor(){
-    paintingArea->colorPickerSetSecondColor();
+		paintingArea->colorPickerSetSecondColor();
 }
 
 void IntelliPhotoGui::slotSwitchColor(){
-    paintingArea->colorPickerSwitchColor();
+		paintingArea->colorPickerSwitchColor();
 }
 
 void IntelliPhotoGui::slotCreatePenTool(){
-    paintingArea->createPenTool();
+		paintingArea->createPenTool();
 }
 
 void IntelliPhotoGui::slotCreatePlainTool(){
-    paintingArea->createPlainTool();
+		paintingArea->createPlainTool();
 }
 
 void IntelliPhotoGui::slotCreateLineTool(){
-    paintingArea->createLineTool();
+		paintingArea->createLineTool();
 }
 
 // Open an about dialog
 void IntelliPhotoGui::slotAboutDialog(){
-    // Window title and text to display
-    QMessageBox::about(this, tr("About Painting"),
-            tr("<p><b>IntelliPhoto</b>Pretty basic editor.</p>"));
+		// Window title and text to display
+		QMessageBox::about(this, tr("About Painting"),
+		                   tr("<p><b>IntelliPhoto</b>Pretty basic editor.</p>"));
 }
 
 // Define menu actions that call functions
 void IntelliPhotoGui::createActions(){
-    // Get a list of the supported file formats
-    // QImageWriter is used to write images to files
-    foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
-        QString text = tr("%1...").arg(QString(format).toUpper());
+		// Get a list of the supported file formats
+		// QImageWriter is used to write images to files
+		foreach (QByteArray format, QImageWriter::supportedImageFormats()) {
+				QString text = tr("%1...").arg(QString(format).toUpper());
 
-        // Create an action for each file format
-        QAction *action = new QAction(text, this);
+				// Create an action for each file format
+				QAction*action = new QAction(text, this);
 
-        // Set an action for each file format
-        action->setData(format);
+				// Set an action for each file format
+				action->setData(format);
 
-        // When clicked call IntelliPhotoGui::save()
-        connect(action, SIGNAL(triggered()), this, SLOT(slotSave()));
+				// When clicked call IntelliPhotoGui::save()
+				connect(action, SIGNAL(triggered()), this, SLOT(slotSave()));
 
-        // Attach each file format option menu item to Save As
-        actionSaveAs.append(action);
-    }
+				// Attach each file format option menu item to Save As
+				actionSaveAs.append(action);
+		}
 
-    //set exporter to actions
-    QAction *pngSaveAction = new QAction("PNG-8", this);
-    pngSaveAction->setData("PNG");
-    // When clicked call IntelliPhotoGui::save()
-    connect(pngSaveAction, SIGNAL(triggered()), this, SLOT(slotSave()));
-    // Attach each PNG in save Menu
-    actionSaveAs.append(pngSaveAction);
+		//set exporter to actions
+		QAction*pngSaveAction = new QAction("PNG-8", this);
+		pngSaveAction->setData("PNG");
+		// When clicked call IntelliPhotoGui::save()
+		connect(pngSaveAction, SIGNAL(triggered()), this, SLOT(slotSave()));
+		// Attach each PNG in save Menu
+		actionSaveAs.append(pngSaveAction);
 
-    // Create exit action and tie to IntelliPhotoGui::close()
-    actionExit = new QAction(tr("&Exit"), this);
-    actionExit->setShortcuts(QKeySequence::Quit);
-    connect(actionExit, SIGNAL(triggered()), this, SLOT(close()));
+		// Create exit action and tie to IntelliPhotoGui::close()
+		actionExit = new QAction(tr("&Exit"), this);
+		actionExit->setShortcuts(QKeySequence::Quit);
+		connect(actionExit, SIGNAL(triggered()), this, SLOT(close()));
 
-    actionOpen = new QAction(tr("&Open"), this);
-    actionOpen->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O));
-    connect(actionOpen, SIGNAL(triggered()), this, SLOT(slotOpen()));
+		actionOpen = new QAction(tr("&Open"), this);
+		actionOpen->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_O));
+		connect(actionOpen, SIGNAL(triggered()), this, SLOT(slotOpen()));
 
-    // Create New Layer action and tie to IntelliPhotoGui::newLayer()
-    actionCreateNewLayer = new QAction(tr("&New Layer..."), this);
-    actionCreateNewLayer->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N));
-    connect(actionCreateNewLayer, SIGNAL(triggered()), this, SLOT(slotCreateNewLayer()));
+		// Create New Layer action and tie to IntelliPhotoGui::newLayer()
+		actionCreateNewLayer = new QAction(tr("&New Layer..."), this);
+		actionCreateNewLayer->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_N));
+		connect(actionCreateNewLayer, SIGNAL(triggered()), this, SLOT(slotCreateNewLayer()));
 
-    // Delete New Layer action and tie to IntelliPhotoGui::deleteLayer()
-    actionDeleteLayer = new QAction(tr("&Delete Layer..."), this);
-    connect(actionDeleteLayer, SIGNAL(triggered()), this, SLOT(slotDeleteLayer()));
+		// Delete New Layer action and tie to IntelliPhotoGui::deleteLayer()
+		actionDeleteLayer = new QAction(tr("&Delete Layer..."), this);
+		connect(actionDeleteLayer, SIGNAL(triggered()), this, SLOT(slotDeleteLayer()));
 
-    actionSetActiveLayer = new QAction(tr("&set Active"), this);
-    connect(actionSetActiveLayer, SIGNAL(triggered()), this, SLOT(slotSetActiveLayer()));
+		actionSetActiveLayer = new QAction(tr("&set Active"), this);
+		connect(actionSetActiveLayer, SIGNAL(triggered()), this, SLOT(slotSetActiveLayer()));
 
-    actionSetActiveAlpha = new QAction(tr("&set Alpha"), this);
-    connect(actionSetActiveAlpha, SIGNAL(triggered()), this, SLOT(slotSetActiveAlpha()));
+		actionSetActiveAlpha = new QAction(tr("&set Alpha"), this);
+		connect(actionSetActiveAlpha, SIGNAL(triggered()), this, SLOT(slotSetActiveAlpha()));
 
-    actionMovePositionUp = new QAction(tr("&move Up"), this);
-    actionMovePositionUp->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Up));
-    connect(actionMovePositionUp, SIGNAL(triggered()), this, SLOT(slotPositionMoveUp()));
+		actionMovePositionUp = new QAction(tr("&move Up"), this);
+		actionMovePositionUp->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Up));
+		connect(actionMovePositionUp, SIGNAL(triggered()), this, SLOT(slotPositionMoveUp()));
 
-    actionMovePositionDown = new QAction(tr("&move Down"), this);
-    actionMovePositionDown->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Down));
-    connect(actionMovePositionDown, SIGNAL(triggered()), this, SLOT(slotPositionMoveDown()));
+		actionMovePositionDown = new QAction(tr("&move Down"), this);
+		actionMovePositionDown->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Down));
+		connect(actionMovePositionDown, SIGNAL(triggered()), this, SLOT(slotPositionMoveDown()));
 
-    actionMovePositionLeft = new QAction(tr("&move Left"), this);
-    actionMovePositionLeft->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Left));
-    connect(actionMovePositionLeft, SIGNAL(triggered()), this, SLOT(slotPositionMoveLeft()));
+		actionMovePositionLeft = new QAction(tr("&move Left"), this);
+		actionMovePositionLeft->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Left));
+		connect(actionMovePositionLeft, SIGNAL(triggered()), this, SLOT(slotPositionMoveLeft()));
 
-    actionMovePositionRight = new QAction(tr("&move Right"), this);
-    actionMovePositionRight->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Right));
-    connect(actionMovePositionRight, SIGNAL(triggered()), this, SLOT(slotPositionMoveRight()));
+		actionMovePositionRight = new QAction(tr("&move Right"), this);
+		actionMovePositionRight->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Right));
+		connect(actionMovePositionRight, SIGNAL(triggered()), this, SLOT(slotPositionMoveRight()));
 
-    actionMoveLayerUp = new QAction(tr("&move Layer Up"), this);
-    actionMoveLayerUp->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Up));
-    connect(actionMoveLayerUp, SIGNAL(triggered()), this, SLOT(slotMoveLayerUp()));
+		actionMoveLayerUp = new QAction(tr("&move Layer Up"), this);
+		actionMoveLayerUp->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Up));
+		connect(actionMoveLayerUp, SIGNAL(triggered()), this, SLOT(slotMoveLayerUp()));
 
-    actionMoveLayerDown= new QAction(tr("&move Layer Down"), this);
-    actionMoveLayerDown->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Down));
-    connect(actionMoveLayerDown, SIGNAL(triggered()), this, SLOT(slotMoveLayerDown()));
+		actionMoveLayerDown= new QAction(tr("&move Layer Down"), this);
+		actionMoveLayerDown->setShortcut(QKeySequence(Qt::CTRL + Qt::ALT + Qt::Key_Down));
+		connect(actionMoveLayerDown, SIGNAL(triggered()), this, SLOT(slotMoveLayerDown()));
 
-    //Create Color Actions here
-    actionColorPickerFirstColor = new QAction(tr("&Main"), this);
-    connect(actionColorPickerFirstColor, SIGNAL(triggered()), this, SLOT(slotSetFirstColor()));
+		//Create Color Actions here
+		actionColorPickerFirstColor = new QAction(tr("&Main"), this);
+		connect(actionColorPickerFirstColor, SIGNAL(triggered()), this, SLOT(slotSetFirstColor()));
 
-    actionColorPickerSecondColor = new QAction(tr("&Secondary"), this);
-    connect(actionColorPickerSecondColor, SIGNAL(triggered()), this, SLOT(slotSetSecondColor()));
+		actionColorPickerSecondColor = new QAction(tr("&Secondary"), this);
+		connect(actionColorPickerSecondColor, SIGNAL(triggered()), this, SLOT(slotSetSecondColor()));
 
-    actionColorSwitch = new QAction(tr("&Switch"), this);
-    actionColorSwitch->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_S));
-    connect(actionColorSwitch, SIGNAL(triggered()), this, SLOT(slotSwitchColor()));
+		actionColorSwitch = new QAction(tr("&Switch"), this);
+		actionColorSwitch->setShortcut(QKeySequence(Qt::CTRL + Qt::SHIFT + Qt::Key_S));
+		connect(actionColorSwitch, SIGNAL(triggered()), this, SLOT(slotSwitchColor()));
 
-    //Create Tool actions down here
-    actionCreatePlainTool = new QAction(tr("&Plain"), this);
-    connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotCreatePlainTool()));
+		//Create Tool actions down here
+		actionCreatePlainTool = new QAction(tr("&Plain"), this);
+		connect(actionCreatePlainTool, SIGNAL(triggered()), this, SLOT(slotCreatePlainTool()));
 
-    actionCreatePenTool = new QAction(tr("&Pen"),this);
-    connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotCreatePenTool()));
+		actionCreatePenTool = new QAction(tr("&Pen"),this);
+		connect(actionCreatePenTool, SIGNAL(triggered()), this, SLOT(slotCreatePenTool()));
 
-    actionCreateLineTool = new QAction(tr("&Line"), this);
-    connect(actionCreateLineTool, SIGNAL(triggered()), this, SLOT(slotCreateLineTool()));
+		actionCreateLineTool = new QAction(tr("&Line"), this);
+		connect(actionCreateLineTool, SIGNAL(triggered()), this, SLOT(slotCreateLineTool()));
 
-    // Create about action and tie to IntelliPhotoGui::about()
-    actionAboutDialog = new QAction(tr("&About"), this);
-    connect(actionAboutDialog, SIGNAL(triggered()), this, SLOT(slotAboutDialog()));
+		// Create about action and tie to IntelliPhotoGui::about()
+		actionAboutDialog = new QAction(tr("&About"), this);
+		connect(actionAboutDialog, SIGNAL(triggered()), this, SLOT(slotAboutDialog()));
 
-    // Create about Qt action and tie to IntelliPhotoGui::aboutQt()
-    actionAboutQtDialog = new QAction(tr("About &Qt"), this);
-    connect(actionAboutQtDialog, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+		// Create about Qt action and tie to IntelliPhotoGui::aboutQt()
+		actionAboutQtDialog = new QAction(tr("About &Qt"), this);
+		connect(actionAboutQtDialog, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
 }
 
 // Create the menubar
 void IntelliPhotoGui::createMenus(){
-    // Create Save As option and the list of file types
-    saveAsMenu = new QMenu(tr("&Save As"), this);
-    foreach (QAction *action, actionSaveAs)
-        saveAsMenu->addAction(action);
+		// Create Save As option and the list of file types
+		saveAsMenu = new QMenu(tr("&Save As"), this);
+		foreach (QAction *action, actionSaveAs)
+		saveAsMenu->addAction(action);
 
 
-    // Attach all actions to File
-    fileMenu = new QMenu(tr("&File"), this);
-    fileMenu->addAction(actionOpen);
-    fileMenu->addMenu(saveAsMenu);
-    fileMenu->addSeparator();
-    fileMenu->addAction(actionExit);
+		// Attach all actions to File
+		fileMenu = new QMenu(tr("&File"), this);
+		fileMenu->addAction(actionOpen);
+		fileMenu->addMenu(saveAsMenu);
+		fileMenu->addSeparator();
+		fileMenu->addAction(actionExit);
 
-    // Attach all actions to Options
-    optionMenu = new QMenu(tr("&Options"), this);
-    optionMenu->addAction(actionSetActiveLayer);
-    optionMenu->addAction(actionSetActiveAlpha);
-    optionMenu->addAction(actionMovePositionUp);
-    optionMenu->addAction(actionMovePositionDown);
-    optionMenu->addAction(actionMovePositionLeft);
-    optionMenu->addAction(actionMovePositionRight);
-    optionMenu->addAction(actionMoveLayerUp);
-    optionMenu->addAction(actionMoveLayerDown);
+		// Attach all actions to Options
+		optionMenu = new QMenu(tr("&Options"), this);
+		optionMenu->addAction(actionSetActiveLayer);
+		optionMenu->addAction(actionSetActiveAlpha);
+		optionMenu->addAction(actionMovePositionUp);
+		optionMenu->addAction(actionMovePositionDown);
+		optionMenu->addAction(actionMovePositionLeft);
+		optionMenu->addAction(actionMovePositionRight);
+		optionMenu->addAction(actionMoveLayerUp);
+		optionMenu->addAction(actionMoveLayerDown);
 
-    // Attach all actions to Layer
-    layerMenu = new QMenu(tr("&Layer"), this);
-    layerMenu->addAction(actionCreateNewLayer);
-    layerMenu->addAction(actionDeleteLayer);
+		// Attach all actions to Layer
+		layerMenu = new QMenu(tr("&Layer"), this);
+		layerMenu->addAction(actionCreateNewLayer);
+		layerMenu->addAction(actionDeleteLayer);
 
-    //Attach all Color Options
-    colorMenu = new QMenu(tr("&Color"), this);
-    colorMenu->addAction(actionColorPickerFirstColor);
-    colorMenu->addAction(actionColorPickerSecondColor);
-    colorMenu->addAction(actionColorSwitch);
+		//Attach all Color Options
+		colorMenu = new QMenu(tr("&Color"), this);
+		colorMenu->addAction(actionColorPickerFirstColor);
+		colorMenu->addAction(actionColorPickerSecondColor);
+		colorMenu->addAction(actionColorSwitch);
 
-    //Attach all Tool Options
-    toolMenu = new QMenu(tr("&Tools"), this);
-    toolMenu->addAction(actionCreatePenTool);
-    toolMenu->addAction(actionCreatePlainTool);
-    toolMenu->addAction(actionCreateLineTool);
-    toolMenu->addSeparator();
-    toolMenu->addMenu(colorMenu);
+		//Attach all Tool Options
+		toolMenu = new QMenu(tr("&Tools"), this);
+		toolMenu->addAction(actionCreatePenTool);
+		toolMenu->addAction(actionCreatePlainTool);
+		toolMenu->addAction(actionCreateLineTool);
+		toolMenu->addSeparator();
+		toolMenu->addMenu(colorMenu);
 
-    // Attach all actions to Help
-    helpMenu = new QMenu(tr("&Help"), this);
-    helpMenu->addAction(actionAboutDialog);
-    helpMenu->addAction(actionAboutQtDialog);
+		// Attach all actions to Help
+		helpMenu = new QMenu(tr("&Help"), this);
+		helpMenu->addAction(actionAboutDialog);
+		helpMenu->addAction(actionAboutQtDialog);
 
-    // Add menu items to the menubar
-    menuBar()->addMenu(fileMenu);
-    menuBar()->addMenu(optionMenu);
-    menuBar()->addMenu(layerMenu);
-    menuBar()->addMenu(toolMenu);
-    menuBar()->addMenu(helpMenu);
+		// Add menu items to the menubar
+		menuBar()->addMenu(fileMenu);
+		menuBar()->addMenu(optionMenu);
+		menuBar()->addMenu(layerMenu);
+		menuBar()->addMenu(toolMenu);
+		menuBar()->addMenu(helpMenu);
 }
 
 void IntelliPhotoGui::createGui(){
-    // create a central widget to work on
-    centralGuiWidget = new QWidget(this);
-    setCentralWidget(centralGuiWidget);
+		// create a central widget to work on
+		centralGuiWidget = new QWidget(this);
+		setCentralWidget(centralGuiWidget);
 
-    // create the grid for the layout
-    mainLayout = new QGridLayout(centralGuiWidget);
-    centralGuiWidget->setLayout(mainLayout);
+		// create the grid for the layout
+		mainLayout = new QGridLayout(centralGuiWidget);
+		centralGuiWidget->setLayout(mainLayout);
 
-    // create Gui elements
-    paintingArea = new PaintingArea();
+		// create Gui elements
+		paintingArea = new PaintingArea();
 
-    // set gui elements
-    mainLayout->addWidget(paintingArea);
+		// set gui elements
+		mainLayout->addWidget(paintingArea);
 }
 
 void IntelliPhotoGui::setIntelliStyle(){
-    // Set the title
-    setWindowTitle("IntelliPhoto Prototype");
-    // Set style sheet
-    this->setStyleSheet("background-color:rgb(64,64,64)");
-    this->centralGuiWidget->setStyleSheet("color:rgb(255,255,255)");
-    this->menuBar()->setStyleSheet("color:rgb(255,255,255)");
+		// Set the title
+		setWindowTitle("IntelliPhoto Prototype");
+		// Set style sheet
+		this->setStyleSheet("background-color:rgb(64,64,64)");
+		this->centralGuiWidget->setStyleSheet("color:rgb(255,255,255)");
+		this->menuBar()->setStyleSheet("color:rgb(255,255,255)");
 }
 
 bool IntelliPhotoGui::maybeSave(){
-    // Check for changes since last save
+		// Check for changes since last save
 
-    // TODO insert variable for modified status here to make an save exit message
-    if (false) {
-       QMessageBox::StandardButton ret;
+		// TODO insert variable for modified status here to make an save exit message
+		if (false) {
+				QMessageBox::StandardButton ret;
 
-       // Painting is the title of the window
-       // Add text and the buttons
-       ret = QMessageBox::warning(this, tr("Painting"),
-                          tr("The image has been modified.\n"
-                             "Do you want to save your changes?"),
-                          QMessageBox::Save | QMessageBox::Discard
-                          | QMessageBox::Cancel);
+				// Painting is the title of the window
+				// Add text and the buttons
+				ret = QMessageBox::warning(this, tr("Painting"),
+				                           tr("The image has been modified.\n"
+				                              "Do you want to save your changes?"),
+				                           QMessageBox::Save | QMessageBox::Discard
+				                           | QMessageBox::Cancel);
 
-       // If save button clicked call for file to be saved
-        if (ret == QMessageBox::Save) {
-            return saveFile("png");
+				// If save button clicked call for file to be saved
+				if (ret == QMessageBox::Save) {
+						return saveFile("png");
 
-        // If cancel do nothing
-        } else if (ret == QMessageBox::Cancel) {
-            return false;
-        }
-    }
-    return true;
+						// If cancel do nothing
+				} else if (ret == QMessageBox::Cancel) {
+						return false;
+				}
+		}
+		return true;
 }
 
 bool IntelliPhotoGui::saveFile(const QByteArray &fileFormat){
-    // Define path, name and default file type
-    QString initialPath = QDir::currentPath() + "/untitled." + fileFormat;
+		// Define path, name and default file type
+		QString initialPath = QDir::currentPath() + "/untitled." + fileFormat;
 
-    // Get selected file from dialog
-    // Add the proper file formats and extensions
-    QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
-                               initialPath,
-                               tr("%1 Files (*.%2);;All Files (*)")
-                               .arg(QString::fromLatin1(fileFormat.toUpper()))
-                               .arg(QString::fromLatin1(fileFormat)), nullptr, QFileDialog::DontUseNativeDialog);
+		// Get selected file from dialog
+		// Add the proper file formats and extensions
+		QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"),
+		                                                initialPath,
+		                                                tr("%1 Files (*.%2);;All Files (*)")
+		                                                .arg(QString::fromLatin1(fileFormat.toUpper()))
+		                                                .arg(QString::fromLatin1(fileFormat)), nullptr, QFileDialog::DontUseNativeDialog);
 
-    // If no file do nothing
-    if (fileName.isEmpty()) {
-        return false;
-    } else {
-        // Call for the file to be saved
-        return paintingArea->save(fileName, fileFormat.constData());
-    }
+		// If no file do nothing
+		if (fileName.isEmpty()) {
+				return false;
+		} else {
+				// Call for the file to be saved
+				return paintingArea->save(fileName, fileFormat.constData());
+		}
 }
diff --git a/src/GUI/IntelliPhotoGui.h b/src/GUI/IntelliPhotoGui.h
index 0e3e1c6..1b45375 100644
--- a/src/GUI/IntelliPhotoGui.h
+++ b/src/GUI/IntelliPhotoGui.h
@@ -68,7 +68,6 @@ private:
     // set style of the GUI
     void setIntelliStyle();
 
-
     // Will check if changes have occurred since last save
     bool maybeSave();
     // Opens the Save dialog and saves
diff --git a/src/IntelliPhoto.pro b/src/IntelliPhoto.pro
index f10c416..a477579 100644
--- a/src/IntelliPhoto.pro
+++ b/src/IntelliPhoto.pro
@@ -29,6 +29,7 @@ SOURCES += \
     Tool/IntelliToolLine.cpp \
     Tool/IntelliToolPen.cpp \
     Tool/IntelliToolPlain.cpp \
+    Tool/IntelliToolPolygon.cpp \
     Tool/IntelliToolRectangle.cpp \
     main.cpp
 
@@ -46,11 +47,11 @@ HEADERS += \
     Tool/IntelliToolLine.h \
     Tool/IntelliToolPen.h \
     Tool/IntelliToolPlain.h \
-    Tool/IntelliToolRectangle.h \
-    Tool/intellitoolcircle.h
+    Tool/IntelliToolPolygon.h \
+    Tool/IntelliToolRectangle.h
 
 FORMS += \
-    widget.ui
+    mainwindow.ui
 
 QMAKE_CXXFLAGS
 QMAKE_LFLAGS
diff --git a/src/Layer/PaintingArea.cpp b/src/Layer/PaintingArea.cpp
index 294127f..5ee6434 100644
--- a/src/Layer/PaintingArea.cpp
+++ b/src/Layer/PaintingArea.cpp
@@ -16,6 +16,7 @@
 #include "Tool/IntelliToolCircle.h"
 #include "Tool/IntelliToolRectangle.h"
 #include "Tool/IntelliToolFloodFill.h"
+#include "Tool/IntelliToolPolygon.h"
 
 PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent)
     :QWidget(parent){
@@ -24,7 +25,7 @@ PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent)
     this->Tool = new IntelliToolFloodFill(this, &colorPicker);
     this->setUp(maxWidth, maxHeight);
     this->addLayer(200,200,0,0,ImageType::Shaped_Image);
-    layerBundle[0].image->drawPlain(QColor(255,0,0,255));
+    layerBundle[0].image->drawPlain(QColor(0,0,255,255));
     std::vector<QPoint> polygon;
     polygon.push_back(QPoint(100,000));
     polygon.push_back(QPoint(200,100));
@@ -36,7 +37,7 @@ PaintingArea::PaintingArea(int maxWidth, int maxHeight, QWidget *parent)
     layerBundle[1].image->drawPlain(QColor(0,255,0,255));
     layerBundle[1].alpha=200;
 
-    activeLayer=1;
+    activeLayer=0;
 }
 
 PaintingArea::~PaintingArea(){
@@ -193,6 +194,14 @@ void PaintingArea::createLineTool(){
     Tool = new IntelliToolLine(this, &colorPicker);
 }
 
+int PaintingArea::getWidthActiveLayer(){
+    return layerBundle.operator[](activeLayer).width;
+}
+
+int PaintingArea::getHeightActiveLayer(){
+    return layerBundle.operator[](activeLayer).hight;
+}
+
 // If a mouse button is pressed check if it was the
 // left button and if so store the current position
 // Set that we are currently drawing
diff --git a/src/Layer/PaintingArea.h b/src/Layer/PaintingArea.h
index d7e0083..868a56c 100644
--- a/src/Layer/PaintingArea.h
+++ b/src/Layer/PaintingArea.h
@@ -56,6 +56,10 @@ public:
     void createPlainTool();
     void createLineTool();
 
+    //get Width and Height of active Layer
+    int getWidthActiveLayer();
+    int getHeightActiveLayer();
+
 public slots:
     // Events to handle
     void slotActivateLayer(int a);
diff --git a/src/Tool/IntelliToolLine.cpp b/src/Tool/IntelliToolLine.cpp
index 6573687..83ed0c7 100644
--- a/src/Tool/IntelliToolLine.cpp
+++ b/src/Tool/IntelliToolLine.cpp
@@ -26,7 +26,7 @@ void IntelliToolLine::onMouseRightReleased(int x, int y){
 void IntelliToolLine::onMouseLeftPressed(int x, int y){
     IntelliTool::onMouseLeftPressed(x,y);
     this->start=QPoint(x,y);
-    this->Canvas->image->drawLine(start, start, colorPicker->getFirstColor(),lineWidth);
+    this->Canvas->image->drawPoint(start, colorPicker->getFirstColor(),lineWidth);
     Canvas->image->calculateVisiblity();
 }
 
diff --git a/src/Tool/IntelliToolPolygon.cpp b/src/Tool/IntelliToolPolygon.cpp
new file mode 100644
index 0000000..d075529
--- /dev/null
+++ b/src/Tool/IntelliToolPolygon.cpp
@@ -0,0 +1,106 @@
+#include "IntelliToolPolygon.h"
+#include "Layer/PaintingArea.h"
+#include <QDebug>
+#include <QCursor>
+
+IntelliToolPolygon::IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* colorPicker)
+    :IntelliTool(Area, colorPicker){
+    lineWidth = 5;
+    isDrawing = false;
+    PointIsNearStart = false;
+    drawingPoint.setX(0);
+    drawingPoint.setY(0);
+    Point.setX(0);
+    Point.setY(0);
+}
+
+void IntelliToolPolygon::onMouseLeftPressed(int x, int y){
+    if(!isDrawing){
+        width = Area->getWidthActiveLayer();
+        height = Area->getHeightActiveLayer();
+    }
+    if(!isDrawing && x > 0 && y > 0 && x < width && y < height){
+        isDrawing = true;
+        drawingPoint.setX(x);
+        drawingPoint.setY(y);
+        QPointList.push_back(drawingPoint);
+        IntelliTool::onMouseLeftPressed(x,y);
+        this->Canvas->image->drawPlain(Qt::transparent);
+        this->Canvas->image->drawPoint(QPointList.back(), colorPicker->getFirstColor(), lineWidth);
+        this->Canvas->image->calculateVisiblity();
+    }
+    else if(isDrawing && isNearStart(x,y,QPointList.front())){
+        PointIsNearStart = isNearStart(x,y,QPointList.front());
+        this->Canvas->image->drawLine(QPointList.back(), QPointList.front(), colorPicker->getFirstColor(), lineWidth);
+        this->Canvas->image->calculateVisiblity();
+    }
+    else if(isDrawing){
+        drawingPoint.setX(x);
+        drawingPoint.setY(y);
+        QPointList.push_back(drawingPoint);
+        this->Canvas->image->drawLine(QPointList.operator[](QPointList.size() - 2), QPointList.back(), colorPicker->getFirstColor(), lineWidth);
+        this->Canvas->image->calculateVisiblity();
+    }
+}
+
+void IntelliToolPolygon::onMouseRightPressed(int x, int y){
+    isDrawing = false;
+    PointIsNearStart = false;
+    QPointList.clear();
+    IntelliTool::onMouseRightPressed(x,y);
+}
+
+void IntelliToolPolygon::onMouseLeftReleased(int x, int y){
+    if(PointIsNearStart && QPointList.size() > 1){
+        this->Canvas->image->calculateVisiblity();
+        PointIsNearStart = false;
+        isDrawing = false;
+        Triangles = IntelliHelper::calculateTriangles(QPointList);
+        for(int i = 0; i < width; i++){
+            for(int j = 0; j < height; j++){
+                Point.setX(i);
+                Point.setY(j);
+                if(IntelliHelper::isInPolygon(Triangles,Point)){
+                    this->Canvas->image->drawPixel(QPoint(i,j), colorPicker->getFirstColor());
+                }
+            }
+        }
+        QPointList.clear();
+        IntelliTool::onMouseLeftReleased(x,y);
+    }
+}
+
+void IntelliToolPolygon::onMouseRightReleased(int x, int y){
+
+}
+
+void IntelliToolPolygon::onWheelScrolled(int value){
+    if(!isDrawing){
+        if(lineWidth + value < 10){
+            lineWidth += value;
+        }
+        if(lineWidth < 1){
+            lineWidth = 1;
+        }
+    }
+}
+
+void IntelliToolPolygon::onMouseMoved(int x, int y){
+
+}
+
+bool IntelliToolPolygon::isNearStart(int x, int y, QPoint Startpoint){
+    bool isNear = false;
+    int StartX = Startpoint.x();
+    int StartY = Startpoint.y();
+    int valueToNear = 10;
+
+    for(int i = StartX - valueToNear; i < StartX + valueToNear; i++){
+        for(int j = StartY - valueToNear; j < StartY + valueToNear; j++){
+            if((i == x) && (j == y)){
+                isNear = true;
+            }
+        }
+    }
+    return isNear;
+}
diff --git a/src/Tool/IntelliToolPolygon.h b/src/Tool/IntelliToolPolygon.h
new file mode 100644
index 0000000..da9fa7c
--- /dev/null
+++ b/src/Tool/IntelliToolPolygon.h
@@ -0,0 +1,79 @@
+#ifndef INTELLITOOLPOLYGON_H
+#define INTELLITOOLPOLYGON_H
+
+#include "IntelliTool.h"
+#include "IntelliHelper/IntelliHelper.h"
+#include <vector>
+#include <QPoint>
+/*!
+ * \brief The IntelliToolPolygon managed the Drawing of Polygonforms
+ */
+class IntelliToolPolygon : public IntelliTool
+{
+public:
+    /*!
+     * \brief IntelliToolPolygon Constructor Define the Tool-intern Parameters
+     * \param Area
+     * \param colorPicker
+     */
+    IntelliToolPolygon(PaintingArea* Area, IntelliColorPicker* colorPicker);
+
+    virtual void onMouseLeftPressed(int x, int y) override;
+    virtual void onMouseLeftReleased(int x, int y) override;
+    virtual void onMouseRightPressed(int x, int y) override;
+    virtual void onMouseRightReleased(int x, int y) override;
+
+    virtual void onWheelScrolled(int value) override;
+
+    virtual void onMouseMoved(int x, int y) override;
+
+private:
+    /*!
+     * \brief isNearStart
+     * \param x
+     * \param y
+     * \param Startpoint
+     * \return true : Near Startpoint, else false
+     */
+    bool isNearStart(int x, int y, QPoint Startpoint);
+
+    /*!
+     * \brief lineWidth of the Drawing Polygon
+     */
+    int lineWidth;
+    /*!
+     * \brief width of the active Layer
+     */
+    int width;
+    /*!
+     * \brief height of the active Layer
+     */
+    int height;
+    /*!
+     * \brief isDrawing true while drawing, else false
+     */
+    bool isDrawing;
+    /*!
+     * \brief PointIsNearStart true, when last click near Startpoint, else false
+     */
+    bool PointIsNearStart;
+    /*!
+     * \brief drawingPoint Current Point after Left-Click
+     */
+    QPoint drawingPoint;
+    /*!
+     * \brief Point Needed to look, if Point is in Polygon
+     */
+    QPoint Point;
+    /*!
+     * \brief QPointList List of all Points of the Polygon
+     */
+    std::vector<QPoint> QPointList;
+    /*!
+     * \brief Triangles Transformed QPointList into triangulated Form of the Polygon
+     */
+    std::vector<Triangle> Triangles;
+
+};
+
+#endif // INTELLITOOLPOLYGON_H
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
new file mode 100644
index 0000000..433b697
--- /dev/null
+++ b/src/mainwindow.ui
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>542</width>
+    <height>459</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>IntelliPhoto</string>
+  </property>
+  <property name="animated">
+   <bool>true</bool>
+  </property>
+  <widget class="QWidget" name="centralwidget"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/widget.ui b/src/widget.ui
deleted file mode 100644
index b1d4c7b..0000000
--- a/src/widget.ui
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Widget</class>
- <widget class="QWidget" name="Widget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>360</width>
-    <height>206</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Widget</string>
-  </property>
- </widget>
- <resources/>
- <connections/>
-</ui>