diff --git a/LeonardoProMicro/SpectralSensor/SpectralSensor.ino b/LeonardoProMicro/SpectralSensor/SpectralSensor.ino
index a1132ff..7ded1e0 100644
--- a/LeonardoProMicro/SpectralSensor/SpectralSensor.ino
+++ b/LeonardoProMicro/SpectralSensor/SpectralSensor.ino
@@ -21,7 +21,7 @@
 // obsługa przycisków zmieniających gain
 //obsługa włączania/wyłączania LED
 
-#define Version "1.0.0"
+#define Version "1.0.1"
 #include <SPI.h>
 #include <Wire.h>
 #include <Adafruit_GFX.h>
@@ -33,37 +33,37 @@
 AS726X sensor;
 Adafruit_SSD1306 display(4);
 
-  int RawRed = 0;
-  int RawOrange = 0;
-  int RawYellow = 0;
-  int RawGreen = 0;
-  int RawBlue = 0;
-  int RawViolet = 0;
-  float CalcRed  = 0.0;
-  float CalcOrange = 0.0;
-  float CalcYellow = 0.0;
-  float CalcGreen = 0.0;
-  float CalcBlue = 0.0;
-  float CalcViolet = 0.0;
-  int HeightRed = 0;
-  int HeightOrange = 0;
-  int HeightYellow = 0;
-  int HeightGreen = 0;
-  int HeightBlue = 0;
-  int HeightViolet = 0;
-  
-  byte gain = 3; //  values: 0,1,2,3
-  float gainValue = 64;
+int RawRed = 0;
+int RawOrange = 0;
+int RawYellow = 0;
+int RawGreen = 0;
+int RawBlue = 0;
+int RawViolet = 0;
+float CalcRed  = 0.0;
+float CalcOrange = 0.0;
+float CalcYellow = 0.0;
+float CalcGreen = 0.0;
+float CalcBlue = 0.0;
+float CalcViolet = 0.0;
+int HeightRed = 0;
+int HeightOrange = 0;
+int HeightYellow = 0;
+int HeightGreen = 0;
+int HeightBlue = 0;
+int HeightViolet = 0;
 
-  
-  int menu_number = 0; //  values:0 menu 1,2,3 bez led, 4,5,6 z LED
+byte gain = 3; //  values: 0,1,2,3
+float gainValue = 64;
 
-  
-  int LedPower = 0;
-  int GraphHeight = 32;
-  int GrapWidth = 20;
-  float ReadValues[6] = {0, 0, 0, 0, 0, 0};
-  float maxValue = 0.0;
+
+int menu_number = 3; //  values:0 menu 1,2,3 bez led, 4,5,6 z LED
+
+
+int LedPower = 0;
+int GraphHeight = 32;
+int GrapWidth = 20;
+float ReadValues[6] = {0, 0, 0, 0, 0, 0};
+float maxValue = 0.0;
 
 void setup() {
   display.begin(SSD1306_SWITCHCAPVCC, 0x3C);
@@ -75,42 +75,72 @@ void setup() {
   display.setCursor(0, 10);
   display.println(Version);
   display.display();
-  delay(1500);  
-//  Wire.begin();
-//  Serial.begin(115200);
-
+  delay(500);
+  Wire.begin();
+  Serial.begin(115200);
   display.clearDisplay();
   sensor.begin();
   pinMode(Btn1, INPUT_PULLUP);
   pinMode(Btn2, INPUT_PULLUP);
-  }
+}
 
 void loop() {
   display.clearDisplay();
   display.setTextSize(1);
   display.setTextColor(WHITE);
-
-//rotation 0 default, pod wyswitlanie grafów
-//roration 1 -tego nie, wyswietlacz pionowy w zla strone
-//roation 2 -tego nie  do gory nogami
-//rotation 3 pod wyswietlanie listy wartosci
+  display.setRotation(0);
+  //rotation 0 default, pod wyswitlanie grafów
+  //roration 1 -tego nie, wyswietlacz pionowy w zla strone
+  //roation 2 -tego nie  do gory nogami
+  //rotation 3 pod wyswietlanie listy wartosci
 
 
-//  data haverest  
-   if (menu_number > 4 ){
-    LedPower = 1; 
-   } else {
-    LedPower = 0; 
-   }
+  if (menu_number > 4 ) {
+    LedPower = 1;
+  } else {
+    LedPower = 0;
+  }
 
   if (LedPower == 1) {
-   sensor.enableBulb();
-   sensor.takeMeasurementsWithBulb(); 
+    sensor.enableBulb();
+    sensor.takeMeasurementsWithBulb();
   } else {
-   sensor.disableBulb();
-   sensor.takeMeasurements();
+    sensor.disableBulb();
+    sensor.takeMeasurements();
   }
-  
+    sensor.takeMeasurements();
+  //gain change
+  if (digitalRead(Btn1) == 0) {
+    if (gain < 3) {
+      gain = gain + 1;
+      sensor.setGain(gain);
+
+    } else {
+      gain = 0;
+      sensor.setGain(gain);
+    }
+  }
+
+  if (gain == 0 ) {
+    gainValue = 1;
+  } else if (gain == 1) {
+    gainValue = 3.7;
+  } else if (gain == 2) {
+    gainValue = 16;
+  } else {
+    gainValue = 64;
+  }
+
+  //gain change//menu change
+  if (digitalRead(Btn2) == 0) {
+    if (menu_number < 8) {
+      menu_number = menu_number + 1;
+    } else {
+      menu_number = 0;
+    }
+  }
+
+  //data haverest
   RawRed    = sensor.getRed();
   RawOrange = sensor.getOrange();
   RawYellow = sensor.getYellow();
@@ -131,61 +161,20 @@ void loop() {
   ReadValues[3] = CalcGreen;
   ReadValues[4] = CalcBlue;
   ReadValues[5] = CalcViolet;
-//  
-////testowa linia
-////void drawLine(64, 32, 1, 32, uint16_t color);  
-//
-////linia 2 pix per 1 gin suma: 12 pix
-////linia 3 linia 5pix dla led+kropka kolo niej 6 pix
-//
-
-if (digitalRead(Btn1) == 0){
-  if (gain < 3){
-      gain = gain+1;
-      sensor.setGain(gain);
-
-  } else {
-    gain = 0;
-    sensor.setGain(gain);
-  }
-}
-
-if (gain == 0 ){
-  gainValue = 1;
-}else if (gain == 1) {
-  gainValue = 3.7;
-}else if (gain == 2){
-  gainValue = 16;
-}else {
-  gainValue = 64;
-}
 
 
-
-if (digitalRead(Btn2) == 0){
-  if (menu_number < 8){
-      menu_number = menu_number+1;
-  } else {
-  menu_number = 0;
-  }
-}
-
-
-
-
-  if (menu_number == 0 || menu_number != 1 ) {//pokaż menu konfiguracyjne
-    display.clearDisplay();
-    display.setRotation(0);
+  if (menu_number == 0 || menu_number != 1 || menu_number != 2 || menu_number != 3) {//pokaż menu konfiguracyjne
+    drawControls();
     display.setCursor(0, 0);
     display.println("GAIN");
     display.setCursor(3, 8);
-    display.println(gainValue,1);
+    display.println(gainValue, 1);
 
     display.setCursor(32, 0);
     display.println("LED");
-    display.setCursor(33,8);
+    display.setCursor(33, 8);
     display.println(LedPower);
-    
+
     display.setCursor(60, 0);
     display.println("BTN1");
     display.setCursor(63, 8);
@@ -197,159 +186,200 @@ if (digitalRead(Btn2) == 0){
     display.println(digitalRead(Btn2));
     display.setCursor(110, 8);
     display.println(menu_number);
-    display.setCursor(0,16);
+    display.setCursor(0, 16);
     display.println("menu; calc; raw");
-    display.setCursor(0,24);
-    display.println("rltive grph;calc grph");    
- 
-  }
-//
-  if (menu_number == 1 || menu_number == 4  ) {//pokaż wartości przeliczone
-    
+    display.setCursor(0, 24);
+    display.println("rltive grph;calc grph");
 
-    display.clearDisplay();
+  }
+  //
+  if (menu_number == 1 || menu_number == 4  ) {//pokaż wartości przeliczone
+    drawControls();
     display.setRotation(0);
     display.setCursor(0, 0);
     display.println("R");
     display.setCursor((GrapWidth), 0);
     display.println("O");
-    display.setCursor((GrapWidth)*2,0);
+    display.setCursor((GrapWidth) * 2, 0);
     display.println("Y");
-    display.setCursor((GrapWidth)*3, 0);
+    display.setCursor((GrapWidth) * 3, 0);
     display.println("G");
-    display.setCursor((GrapWidth)*4, 0);
-    display.println("B");    
-    display.setCursor((GrapWidth)*5, 0);
+    display.setCursor((GrapWidth) * 4, 0);
+    display.println("B");
+    display.setCursor((GrapWidth) * 5, 0);
     display.println("V");
-
-
-//display.display();
     display.setRotation(3);
     display.setCursor(0, 10);
     display.println(CalcRed, 1);
-    display.setCursor(0, (GrapWidth * 1)+10);
+    display.setCursor(0, (GrapWidth * 1) + 10);
     display.println(CalcOrange, 1);
-    display.setCursor(0, (GrapWidth * 2)+10);
+    display.setCursor(0, (GrapWidth * 2) + 10);
     display.println(CalcYellow, 1);
-    display.setCursor(0, (GrapWidth * 3)+10);
+    display.setCursor(0, (GrapWidth * 3) + 10);
     display.println(CalcGreen, 1);
-    display.setCursor(0, (GrapWidth * 4)+10);
+    display.setCursor(0, (GrapWidth * 4) + 10);
     display.println(CalcBlue, 1);
-    display.setCursor(0, (GrapWidth * 5)+10);
-    display.println(CalcViolet, 1);    
-
-    
+    display.setCursor(0, (GrapWidth * 5) + 10);
+    display.println(CalcViolet, 1);
   }
- display.setRotation(0);
-//  
-//  if (menu_number == 2 || menu_number == 5) { //pokaż wartości bezpośrednie
-////    display.setRotation(2);
-//    
-//    display.setCursor(GrapWidth, 0);
-//    display.println("rR:");
-//    display.setCursor(GrapWidth, 10);
-//    display.println(RawRed, 1);
-//    
-//    display.setCursor(GrapWidth * 2, 0);
-//    display.println("rO:");
-//    display.setCursor(GrapWidth * 2, 10);
-//    display.println(RawOrange, 1);
-//
-//    display.setCursor(GrapWidth * 3, 0);
-//    display.println("rY:");
-//    display.setCursor(GrapWidth * 3, 10);
-//    display.println(RawYellow, 1);
-//    display.setCursor(0, 20);
-//       
-//    display.setCursor(GrapWidth * 4, 0);
-//    display.println("rG:");
-//    display.setCursor(GrapWidth * 4, 10);
-//    display.println(RawGreen, 1);
-//
-//    display.setCursor(GrapWidth * 5, 0);
-//    display.println("rB:");
-//    display.setCursor(GrapWidth * 5, 10);
-//    display.println(RawBlue, 1);
-//    
-//    display.setCursor(GrapWidth * 6, 0);
-//    display.println("rV:");
-//    display.setCursor(GrapWidth * 6, 10);
-//    display.println(RawYellow, 1);
-//  }
-////    display.setRotation(0);
-//
-//  if (menu_number == 3 || menu_number == 6 ){  //pokaż grafy
-////      display.setRotation(0);
-//
-//    for (int i = 0; i < 5; i++) {
-//        maxValue = max(maxValue, ReadValues[i]); 
-//    }
-//    HeightRed     = int((CalcRed     / maxValue) * GraphHeight);
-//    HeightOrange  = int((CalcOrange  / maxValue) * GraphHeight);
-//    HeightYellow  = int((CalcYellow  / maxValue) * GraphHeight);
-//    HeightGreen   = int((CalcGreen   / maxValue) * GraphHeight);
-//    HeightBlue    = int((CalcBlue    / maxValue) * GraphHeight);
-//    HeightViolet  = int((CalcViolet  / maxValue) * GraphHeight);
-//
-//    
-//    display.setCursor(1 * GrapWidth -10, 10);
-//    if (HeightRed >25){
-//        display.setTextColor(BLACK);
-//    }
-//       
-//    display.fillRect(0 * GrapWidth,     GraphHeight - HeightRed,    GrapWidth, HeightRed,     SSD1306_WHITE);
-//    display.fillRect(1 * GrapWidth + 1, GraphHeight - HeightOrange, GrapWidth, HeightOrange,  SSD1306_WHITE);
-//    display.fillRect(2 * GrapWidth + 2, GraphHeight - HeightYellow, GrapWidth, HeightYellow,  SSD1306_WHITE);
-//    display.fillRect(3 * GrapWidth + 3, GraphHeight - HeightGreen,  GrapWidth, HeightGreen,   SSD1306_WHITE);
-//    display.fillRect(4 * GrapWidth + 4, GraphHeight - HeightBlue,   GrapWidth, HeightBlue,    SSD1306_WHITE);
-//    display.fillRect(5 * GrapWidth + 5, GraphHeight - HeightViolet, GrapWidth, HeightViolet,  SSD1306_WHITE);
-//    display.setCursor(1 * GrapWidth -10, 0);
-//    if (HeightRed > 28){
-//        display.setTextColor(BLACK);
-//    }else {
-//        display.setTextColor(WHITE);
-//    }
-//    display.println("R:");
-//    display.setCursor(2 * GrapWidth -10, 0);
-//    if (HeightOrange > 28){
-//        display.setTextColor(BLACK);
-//    }else {
-//        display.setTextColor(WHITE);
-//    }
-//    display.println("O:");
-//    display.setCursor(3 * GrapWidth -10, 0);
-//    if (HeightYellow > 28){
-//        display.setTextColor(BLACK);
-//    }else {
-//        display.setTextColor(WHITE);
-//    }
-//    display.println("Y:");
-//    display.setCursor(4 * GrapWidth -10, 0);
-//    if (HeightGreen > 28){
-//        display.setTextColor(BLACK);
-//    }else {
-//        display.setTextColor(WHITE);
-//    }
-//    display.println("G:");
-//    display.setCursor(5 * GrapWidth -10, 0);
-//    if (HeightBlue > 28){
-//        display.setTextColor(BLACK);
-//    }else {
-//        display.setTextColor(WHITE);
-//    }
-//    display.println("B:");
-//    display.setCursor(6 * GrapWidth -10, 0);
-//    if (HeightViolet > 28){
-//        display.setTextColor(BLACK);
-//    }else {
-//        display.setTextColor(WHITE);
-//    }
-//    display.println("V:");
-//
-//    maxValue = 0.0;
-//  }
-//  
-    display.display();
-    delay(50);
+  display.setRotation(0);
+  
+    if (menu_number == 2 || menu_number == 5) { //pokaż wartości bezpośrednie
+      drawControls();
+      display.setRotation(0);
+      display.setCursor(0, 0);
+      display.println("R");
+      display.setCursor((GrapWidth), 0);
+      display.println("O");
+      display.setCursor((GrapWidth) * 2, 0);
+      display.println("Y");
+      display.setCursor((GrapWidth) * 3, 0);
+      display.println("G");
+      display.setCursor((GrapWidth) * 4, 0);
+      display.println("B");
+      display.setCursor((GrapWidth) * 5, 0);
+      display.println("V");
+      display.setRotation(3);
+
+      display.setCursor(0, 5);
+      display.println(RawRed, 1);
+      display.setCursor(0, (GrapWidth * 1) + 5);
+      display.println(RawOrange, 1);
+      display.setCursor(0, (GrapWidth * 2) + 5);
+      display.println(RawYellow, 1);
+      display.setCursor(0, (GrapWidth * 3) + 5);
+      display.println(RawGreen, 1);
+      display.setCursor(0, (GrapWidth * 4) + 5);
+      display.println(RawBlue, 1);
+      display.setCursor(0, (GrapWidth * 5) + 5);
+      display.println(RawYellow, 1);
+
+
+    }
+      display.setRotation(0);
+  
+    if (menu_number == 3 || menu_number == 6 ){  //pokaż grafy
+      drawControls();
+      display.setRotation(0);
+  
+      for (int i = 0; i < 5; i++) {
+          maxValue = max(maxValue, ReadValues[i]);
+      }
+      HeightRed     = int((CalcRed     / maxValue) * GraphHeight);
+      HeightOrange  = int((CalcOrange  / maxValue) * GraphHeight);
+      HeightYellow  = int((CalcYellow  / maxValue) * GraphHeight);
+      HeightGreen   = int((CalcGreen   / maxValue) * GraphHeight);
+      HeightBlue    = int((CalcBlue    / maxValue) * GraphHeight);
+      HeightViolet  = int((CalcViolet  / maxValue) * GraphHeight);
+  
+  
+      display.setCursor(1 * GrapWidth -10, 10);
+      if (HeightRed >25){
+          display.setTextColor(BLACK);
+      }
+  
+      display.fillRect(0 * GrapWidth,     GraphHeight - HeightRed,    GrapWidth, HeightRed,     SSD1306_WHITE);
+      display.fillRect(1 * GrapWidth + 1, GraphHeight - HeightOrange, GrapWidth, HeightOrange,  SSD1306_WHITE);
+      display.fillRect(2 * GrapWidth + 2, GraphHeight - HeightYellow, GrapWidth, HeightYellow,  SSD1306_WHITE);
+      display.fillRect(3 * GrapWidth + 3, GraphHeight - HeightGreen,  GrapWidth, HeightGreen,   SSD1306_WHITE);
+      display.fillRect(4 * GrapWidth + 4, GraphHeight - HeightBlue,   GrapWidth, HeightBlue,    SSD1306_WHITE);
+      display.fillRect(5 * GrapWidth + 5, GraphHeight - HeightViolet, GrapWidth, HeightViolet,  SSD1306_WHITE);
+      display.setCursor(1 * GrapWidth -10, 0);
+      if (HeightRed > 28){
+          display.setTextColor(BLACK);
+      }else {
+          display.setTextColor(WHITE);
+      }
+      display.println("R:");
+      display.setCursor(2 * GrapWidth -10, 0);
+      if (HeightOrange > 28){
+          display.setTextColor(BLACK);
+      }else {
+          display.setTextColor(WHITE);
+      }
+      display.println("O:");
+      display.setCursor(3 * GrapWidth -10, 0);
+      if (HeightYellow > 28){
+          display.setTextColor(BLACK);
+      }else {
+          display.setTextColor(WHITE);
+      }
+      display.println("Y:");
+      display.setCursor(4 * GrapWidth -10, 0);
+      if (HeightGreen > 28){
+          display.setTextColor(BLACK);
+      }else {
+          display.setTextColor(WHITE);
+      }
+      display.println("G:");
+      display.setCursor(5 * GrapWidth -10, 0);
+      if (HeightBlue > 28){
+          display.setTextColor(BLACK);
+      }else {
+          display.setTextColor(WHITE);
+      }
+      display.println("B:");
+      display.setCursor(6 * GrapWidth -10, 0);
+      if (HeightViolet > 28){
+          display.setTextColor(BLACK);
+      }else {
+          display.setTextColor(WHITE);
+      }
+      display.println("V:");
+  
+      maxValue = 0.0;
+    }
+  
+  display.display();
+  delay(500);
+
+}
+
+
+void drawControls() {
+  display.clearDisplay();
+  display.setRotation(0);
+  //    linia pozycyjna LED
+  display.drawPixel(127, 24, SSD1306_WHITE);
+  if (LedPower == 1) {
+    display.drawLine(127, 26, 127, 31, SSD1306_WHITE);
+  }
+  //gain:
+  display.drawPixel(127, 0, SSD1306_WHITE);
+  if (gain >= 1) {
+    display.drawPixel(127, 2, SSD1306_WHITE);
+  }
+  if (gain >= 2) {
+    display.drawPixel(127, 4, SSD1306_WHITE);
+  }
+  if (gain >= 3) {
+    display.drawPixel(127, 6, SSD1306_WHITE);
+  }
+  // menu
+  if (menu_number >= 1  ) {
+  display.drawPixel(127, 10, SSD1306_WHITE);
+  }
+  if ((menu_number >= 2 && menu_number <5 )|| menu_number >= 6 ) {
+    display.drawPixel(127, 12, SSD1306_WHITE);
+  }
+  if ((menu_number >= 3 && menu_number <5)  || menu_number >= 7 ) {
+    display.drawPixel(127, 14, SSD1306_WHITE);
+  }
+  if ((menu_number >= 4 && menu_number <5 ) || menu_number >= 8 ) {
+    display.drawPixel(127, 16, SSD1306_WHITE);
+  }
+  
+}
+
+void printlnAlignedR(const float value, int x, int y, int prec) {
+  char textRepresentation;
+  int16_t x1, y1;
+  uint16_t w, h;
+//  textRepresentation  = snprintf(buffer+j, 6, "%f\n", fp)
+//  round(value);
+//  display.getTextBounds(textRepresentation, x, y, &x1, &y1, &w, &h); //calc width of new string
+  display.setCursor(x - w / 2, y); //zmienić ten algorytm
+  //    display.println(buf, 1);
+  display.println(textRepresentation);
 
 }