diff --git a/main/CalendarTab/CalendarManager.h b/main/CalendarTab/CalendarManager.h
index e45430c..f835f65 100644
--- a/main/CalendarTab/CalendarManager.h
+++ b/main/CalendarTab/CalendarManager.h
@@ -1,13 +1,13 @@
 #ifndef CALENDARMANAGER_H
 #define CALENDARMANAGER_H
 
-#include "./src/jceData/Calendar/coursesSchedule/calendarPage.h"
-#include "./src/jceData/Calendar/coursesSchedule/calendarSchedule.h"
-#include "./src/jceData/Calendar/coursesSchedule/calendarDialog.h"
-#include "./src/jceData/CSV/csv_exporter.h"
+#include "../../src/jceData/Calendar/coursesSchedule/calendarPage.h"
+#include "../../src/jceData/Calendar/coursesSchedule/calendarSchedule.h"
+#include "../../src/jceData/Calendar/coursesSchedule/calendarDialog.h"
+#include "../../src/jceData/CSV/csv_exporter.h"
 
-#include "./src/jceData/Calendar/Exams/calendarExam.h"
-#include "./src/jceData/Calendar/Exams/examDialog.h"
+#include "../../src/jceData/Calendar/Exams/calendarExam.h"
+#include "../../src/jceData/Calendar/Exams/examDialog.h"
 
 #include <QObject>
 #include <QWidget>
diff --git a/main/CourseTab/coursestablemanager.h b/main/CourseTab/coursestablemanager.h
index 41e8713..6600400 100644
--- a/main/CourseTab/coursestablemanager.h
+++ b/main/CourseTab/coursestablemanager.h
@@ -9,9 +9,9 @@
 #include <QString>
 #include <QMessageBox>
 
-#include "./src/jceData/Grades/graph/gradegraph.h"
-#include "./src/jceData/Grades/gradePage.h"
-#include "./src/jceSettings/user.h"
+#include "../../src/jceData/Grades/graph/gradegraph.h"
+#include "../../src/jceData/Grades/gradePage.h"
+#include "../../src/jceSettings/user.h"
 
 class coursesTableManager
 {
diff --git a/main/LoginTab/loginhandler.h b/main/LoginTab/loginhandler.h
index 6b13fbf..fb8b77f 100644
--- a/main/LoginTab/loginhandler.h
+++ b/main/LoginTab/loginhandler.h
@@ -8,9 +8,9 @@
 #include <QPixmap>
 #include <QPushButton>
 
-#include "./src/jceSettings/jcelogin.h"
-#include "./src/appDatabase/savedata.h"
-#include "./main/jceWidgets/jcestatusbar.h"
+#include "../../src/jceSettings/jcelogin.h"
+#include "../../src/appDatabase/savedata.h"
+#include "../../main/jceWidgets/jcestatusbar.h"
 
 
 class loginHandler : public QObject
diff --git a/src/jceConnection/jcesslclient.h b/src/jceConnection/jcesslclient.h
index 122481d..63362f4 100644
--- a/src/jceConnection/jcesslclient.h
+++ b/src/jceConnection/jcesslclient.h
@@ -11,7 +11,7 @@
 #include <QNetworkConfigurationManager>
 #include <QtNetwork/QNetworkInterface>
 
-#include "./main/jceWidgets/jcestatusbar.h"
+#include "../../main/jceWidgets/jcestatusbar.h"
 
 #define packetSize 4096 //4k
 #define milisTimeOut 5000 //4 seconds
diff --git a/src/jceData/Grades/graph/gradegraph.h b/src/jceData/Grades/graph/gradegraph.h
index b5324fe..f842805 100644
--- a/src/jceData/Grades/graph/gradegraph.h
+++ b/src/jceData/Grades/graph/gradegraph.h
@@ -1,8 +1,7 @@
 #ifndef GRADEGRAPH_H
 #define GRADEGRAPH_H
 
-#include "./src/jceData/Grades/gradePage.h"
-#include "qcustomplot.h"
+#include "../gradePage.h"
 #include <QDialog>
 
 namespace Ui {
diff --git a/src/jceData/Grades/graph/gradegraph.ui b/src/jceData/Grades/graph/gradegraph.ui
index 5744652..12e8834 100644
--- a/src/jceData/Grades/graph/gradegraph.ui
+++ b/src/jceData/Grades/graph/gradegraph.ui
@@ -82,7 +82,7 @@
   <customwidget>
    <class>QCustomPlot</class>
    <extends>QWidget</extends>
-   <header>src/jceData/Grades/graph/qcustomplot.h</header>
+   <header>qcustomplot.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
diff --git a/src/jceSettings/jceLoginHtmlScripts.h b/src/jceSettings/jceLoginHtmlScripts.h
index 2eba6c3..b90bad4 100644
--- a/src/jceSettings/jceLoginHtmlScripts.h
+++ b/src/jceSettings/jceLoginHtmlScripts.h
@@ -1,7 +1,7 @@
 #ifndef JCELOGINHTMLSCRIPTS_H
 #define JCELOGINHTMLSCRIPTS_H
 
-#include "./src/jceSettings/user.h"
+#include "../../src/jceSettings/user.h"
 
 #define dst_host "yedion.jce.ac.il"
 #define dst_port 443
diff --git a/src/jceSettings/jcelogin.cpp b/src/jceSettings/jcelogin.cpp
index 7819b46..59118d1 100644
--- a/src/jceSettings/jcelogin.cpp
+++ b/src/jceSettings/jcelogin.cpp
@@ -38,7 +38,7 @@ int jceLogin::makeConnection()
 
   returnMode = checkConnection(); //checking socket status. is connected?
 
-  if (returnMode == false)
+  if (returnMode == (int)false)
     {
       statusBar->setIconConnectionStatus(jceStatusBar::Connecting);
       if (JceConnector->makeConnect(dst_host,dst_port) == false) //couldnt make a connection
@@ -47,19 +47,19 @@ int jceLogin::makeConnection()
         returnMode = true;
     }
 
-  if (returnMode == true) //connected to host
+  if (returnMode == (int)true) //connected to host
     {
       statusBar->setIconConnectionStatus(jceStatusBar::Connected);
       returnMode = makeFirstVisit();
-      if (returnMode == true) //requst and send first validation
+      if (returnMode == (int)true) //requst and send first validation
         {
           status = jceStatus::JCE_START_VALIDATING_PROGRESS;
           returnMode = checkValidation();
-          if (returnMode == true) //check if username and password are matching
+          if (returnMode == (int)true) //check if username and password are matching
             {
               status = jceStatus::JCE_VALIDATION_PASSED;
               returnMode = makeSecondVisit();
-              if (returnMode == true) //siging in the website
+              if (returnMode == (int)true) //siging in the website
                 {
                   qDebug() << Q_FUNC_INFO << "Signed in succeesfully";
                   status = jceStatus::JCE_YOU_ARE_IN;
@@ -317,11 +317,11 @@ void jceLogin::reValidation()
 {
   qDebug() << Q_FUNC_INFO << "Revalidating user";
 
-  if (makeFirstVisit() == true)
+  if (makeFirstVisit() == (int)true)
     {
       if (checkValidation())
         {
-          if (makeSecondVisit() == true)
+          if (makeSecondVisit() == (int)true)
           {
               statusBar->setIconConnectionStatus(jceStatusBar::LoggedIn);
             qDebug() << Q_FUNC_INFO << "Validated";
diff --git a/src/jceSettings/jcelogin.h b/src/jceSettings/jcelogin.h
index a0443d6..1e0a2ff 100644
--- a/src/jceSettings/jcelogin.h
+++ b/src/jceSettings/jcelogin.h
@@ -2,8 +2,8 @@
 #define JCELOGIN_H
 
 
-#include "./src/jceConnection/jcesslclient.h"
-#include "./src/jceSettings/user.h"
+#include "../../src/jceConnection/jcesslclient.h"
+#include "../../src/jceSettings/user.h"
 #include "jceLoginHtmlScripts.h"