diff --git a/main/coursestablemanager.cpp b/main/coursestablemanager.cpp
index 7f127bd..db6991c 100644
--- a/main/coursestablemanager.cpp
+++ b/main/coursestablemanager.cpp
@@ -52,7 +52,7 @@ void coursesTableManager::setCoursesList(std::string &html)
     gp = new GradePage(html);
 }
 /**
- * @brief coursesTableManager::changes  when user changes the table manually it updates it
+ * @brief coursesTableManager::changes  when user changes the table manually
  * @param change    string change
  * @param row       row index
  * @param col       col index
@@ -61,7 +61,7 @@ void coursesTableManager::setCoursesList(std::string &html)
 bool coursesTableManager::changes(QString change, int row, int col)
 {
 
-    bool isNumFlag = true;
+    bool isNumFlag = true; //a flag to check if number
 
     int serialCourse = courseTBL->item(row,Course::CourseScheme::SERIAL)->text().toInt();
     for (Course *c: *gp->getCourses())
diff --git a/main/mainscreen.cpp b/main/mainscreen.cpp
index 7c45eed..eab8cd3 100644
--- a/main/mainscreen.cpp
+++ b/main/mainscreen.cpp
@@ -50,6 +50,7 @@ MainScreen::~MainScreen()
     delete loginHandel;
     delete ui;
 }
+/*** LOGIN TAB FUNCTIONS ***/
 void MainScreen::on_loginButton_clicked()
 {
     if (loginHandel->isLoggedInFlag())
@@ -59,7 +60,19 @@ void MainScreen::on_loginButton_clicked()
         uiSetConnectMode();
 
 }
+void MainScreen::on_usrnmLineEdit_editingFinished()
+{
+    ui->usrnmLineEdit->setText(ui->usrnmLineEdit->text().toLower());
+}
+void MainScreen::on_keepLogin_clicked()
+{
+    if (ui->keepLogin->isChecked())
+        SaveData::save(ui->usrnmLineEdit->text(),ui->pswdLineEdit->text());
 
+    else
+        SaveData::deleteData();
+}
+/*** COURSES TAB FUNCTIONS ***/
 void MainScreen::on_ratesButton_clicked()
 {
     std::string pageString;
@@ -77,10 +90,22 @@ void MainScreen::on_ratesButton_clicked()
             QMessageBox::critical(this,tr("Error"),tr("Not Connected"));
         }
     }
-
-
-
 }
+void MainScreen::on_coursesTable_itemChanged(QTableWidgetItem *item)
+{
+    if (this->courseTableMgr->changes(item->text(),item->row(),item->column()))
+        ui->avgLCD->display(courseTableMgr->getAvg());
+    else
+        QMessageBox::critical(this,"Error","Missmatching data");
+}
+void MainScreen::on_clearTableButton_clicked()
+{
+
+    courseTableMgr->clearTable();
+    ui->avgLCD->display(courseTableMgr->getAvg());
+}
+
+/*** SETTING TAB FUNCTIONS ***/
 void MainScreen::on_spinBoxFromYear_editingFinished()
 {
     if (ui->spinBoxFromYear->value() > ui->spinBoxToYear->value())
@@ -127,26 +152,15 @@ void MainScreen::on_spinBoxToSemester_editingFinished()
     }
     updateDates();
 }
-
-void MainScreen::on_coursesTable_itemChanged(QTableWidgetItem *item)
-{
-    if (this->courseTableMgr->changes(item->text(),item->row(),item->column()))
-        ui->avgLCD->display(courseTableMgr->getAvg());
-    else
-        QMessageBox::critical(this,"Error","Missmatching data");
-}
-
-
-
 void MainScreen::on_checkBox_toggled(bool checked)
 {
     this->userLoginSetting->setInfluenceCourseOnly(checked);
     this->courseTableMgr->influnceCourseChanged(checked);
 }
-void MainScreen::on_usrnmLineEdit_editingFinished()
-{
-    ui->usrnmLineEdit->setText(ui->usrnmLineEdit->text().toLower());
-}
+/*
+ * ------------------------------
+ *
+*/
 void MainScreen::updateDates()
 {
     std::string fy,ty,fs,ts;
@@ -247,12 +261,6 @@ void MainScreen::on_actionCredits_triggered()
                        "</ul>");
 }
 
-void MainScreen::on_clearTableButton_clicked()
-{
-
-    courseTableMgr->clearTable();
-    ui->avgLCD->display(courseTableMgr->getAvg());
-}
 
 void MainScreen::on_actionExit_triggered()
 {
@@ -260,14 +268,7 @@ void MainScreen::on_actionExit_triggered()
 }
 
 
-void MainScreen::on_keepLogin_clicked()
-{
-    if (ui->keepLogin->isChecked())
-        SaveData::save(ui->usrnmLineEdit->text(),ui->pswdLineEdit->text());
 
-    else
-        SaveData::deleteData();
-}
 
 void MainScreen::on_actionHow_To_triggered()
 {
@@ -292,3 +293,5 @@ void MainScreen::on_actionHow_To_triggered()
                              " </ul>");
 
 }
+
+
diff --git a/main/mainscreen.h b/main/mainscreen.h
index 4957a1c..bf4b4a3 100644
--- a/main/mainscreen.h
+++ b/main/mainscreen.h
@@ -55,7 +55,7 @@ private slots:
     void on_keepLogin_clicked();
 
     void on_actionHow_To_triggered();
-
+    
 private:
 
     void updateDates();
diff --git a/main/mainscreen.ui b/main/mainscreen.ui
index 8e3bcf1..04cc955 100644
--- a/main/mainscreen.ui
+++ b/main/mainscreen.ui
@@ -61,7 +61,7 @@ background: qlineargradient(spread:pad, x1:0.496, y1:0, x2:0.508, y2:1, stop:0 r
        <enum>QTabWidget::Rounded</enum>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="documentMode">
        <bool>false</bool>
@@ -584,6 +584,9 @@ font-size: 15px;
                       <property name="readOnly">
                        <bool>false</bool>
                       </property>
+                      <property name="showGroupSeparator" stdset="0">
+                       <bool>false</bool>
+                      </property>
                       <property name="minimum">
                        <number>2009</number>
                       </property>
@@ -593,9 +596,6 @@ font-size: 15px;
                       <property name="value">
                        <number>2009</number>
                       </property>
-                      <property name="showGroupSeparator" stdset="0">
-                       <bool>false</bool>
-                      </property>
                      </widget>
                     </item>
                    </layout>
@@ -675,7 +675,7 @@ font-size: 15px;
      <x>0</x>
      <y>0</y>
      <width>855</width>
-     <height>21</height>
+     <height>29</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuA_about">