diff --git a/src/main.cpp b/src/main.cpp
index dfb6f58..48b26e9 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,6 +8,15 @@
 #include <ctime>
 #include <unistd.h>
 #include "Board.h"
+#ifndef _WIN32
+#include <signal.h>
+#include <sys/ioctl.h>
+struct winsize w;
+void handleSIGWINCH(int sig)
+{
+    ioctl(STDIN_FILENO, TIOCGWINSZ, &w);
+}
+#endif
 
 #define MAX_TIME 60
 
@@ -33,8 +42,16 @@ void startGame(Board &board)
 
     while (gameRunning)
     {
-
         usleep((1000 / MAX_TIME) * 1000);
+#ifndef _WIN32
+        if((w.ws_row < boardSize.x + 3 )||( w.ws_col < boardSize.y + 2)) {
+            mvprintw(w.ws_col/2, w.ws_row/2, "Your terminal is too small:");
+            mvprintw(w.ws_col / 2 + 1, w.ws_row/2, "Current size: %dx%d", w.ws_row, w.ws_col);
+            mvprintw(w.ws_col / 2 + 2, w.ws_row/2, "Min size: %dx%d", boardSize.x + 3, boardSize.y + 2);
+            refresh();
+            continue;
+        }
+#endif
         if (board.isGameOver() || board.isGameWon())
         {
             gameRunning = false;
@@ -161,6 +178,9 @@ void startGame(Board &board)
             break;
         case 'q':
             exit(0);
+            echo();
+            cbreak();
+            endwin();
             break;
         case 'z':
             if (!somethingHasBeenDone)
@@ -255,12 +275,18 @@ void startGame(Board &board)
         mvprintw(1, 8, "%s", tim);
         attroff(COLOR_PAIR(3));
         refresh();
-        while ((c = getch()) != 'q')
+        while (true)
         {
+            c = getch();
             if (c == 'r')
             {
                 Board newBoard(boardSize.x, boardSize.y, board.getMineCount());
                 startGame(newBoard);
+            } else if(c == 'q') {
+                exit(0);
+                echo();
+                cbreak();
+                endwin();
             }
         };
     }
@@ -279,12 +305,18 @@ void startGame(Board &board)
         attroff(COLOR_PAIR(3));
         refresh();
         int c;
-        while ((c = getch()) != 'q')
+        while (true)
         {
+            c = getch();
             if (c == 'r')
             {
                 Board newBoard(boardSize.x, boardSize.y, board.getMineCount());
                 startGame(newBoard);
+            } else if(c == 'q') {
+                exit(0);
+                echo();
+                cbreak();
+                endwin();
             }
         };
     }
@@ -292,12 +324,14 @@ void startGame(Board &board)
 
 int main()
 {
+    signal(SIGWINCH, handleSIGWINCH);
     setlocale(LC_ALL, "");
     initscr();
     noecho();
     cbreak();
     keypad(stdscr, TRUE);
     nodelay(stdscr, TRUE);
+    ioctl(STDOUT_FILENO, TIOCGWINSZ, &w);
 
     start_color();
     init_pair(1, COLOR_BLUE, COLOR_BLACK);
@@ -328,9 +362,9 @@ int main()
         attroff(A_REVERSE);
         mvprintw(3, 2, choice == 1 ? "" : "Intermediate (16x16, 40 mines)");
         attron(A_REVERSE);
-        mvprintw(4, 2, choice == 2 ? "Expert (16x30, 99 mines)" : "");
+        mvprintw(4, 2, choice == 2 ? "Expert (30x16, 99 mines)" : "");
         attroff(A_REVERSE);
-        mvprintw(4, 2, choice == 2 ? "" : "Expert (16x30, 99 mines)");
+        mvprintw(4, 2, choice == 2 ? "" : "Expert (30x16, 99 mines)");
         refresh();
 
         int ch = getch();