 
 	// Clear the screen
 	tft.clrScr();
+	tft.setFont(BigFont);
 
 	// Display the header of the menu - the header is the first item
 	tft.setColor(VGA_LIME);
-	tft.print(mainMenu[0], 0, 0);
+	tft.print(mainMenu[0], 48, 0);
 
 	// Draw separation line
-	tft.drawLine(0, 0, tft.getDisplayXSize(), 0);
+	tft.drawLine(0, MENU_TOP-5, tft.getDisplayXSize()-1, MENU_TOP-5);
 
 	// Display other menu items
 	tft.setColor(VGA_YELLOW);

	// Button Handling //
	/////////////////////



	/////////////////////
	// Sensor handling //
	/////////////////////

	switch (currentScreen) {
		case DIVE_START_SCREEN: {
			// Read pressure from the sensor in mbar.
			float pressureInMillibar = sensor.getPressure(ADC_4096);

			//Switch to DIVE PROGRESS mode, if the diver has already descended below 2 meters
			if (pressureInMillibar > 1200) {
				diveStartButtonPressed();
			} else {
				if (pressureInMillibar > seaLevelAtmosphericPressure) {
					depthInMeter = diveDeco.calculateDepthFromPressure(pressureInMillibar);
				}
				float temperatureInCelsius = sensor.getTemperature(CELSIUS, ADC_512);

				drawCurrentTemperature(temperatureInCelsius);
				drawCurrentPressure(pressureInMillibar);
				drawDepth(depthInMeter);
			}
		}
		break;
		case DIVE_SCREEN: {

const char* METER = "meter";
const char* CEL_SHORT = "cel";

char* mainMenu[] = {" DiveIno - Main Menu ",
                " Dive",
                " Logbook",
				" Surface Time",
