diff --git a/CONTRIBUTIONS.md b/CONTRIBUTIONS.md
index 8220031..0e06ce0 100644
--- a/CONTRIBUTIONS.md
+++ b/CONTRIBUTIONS.md
@@ -27,7 +27,7 @@ For those who have some python experience as well, you can:
 * Find `gui.kv` and add a button near the others: 
     ```
     LangButton:
-        icon: 'img/flaticon/flag-<lang>.png'
+        icon: 'img/flags/flag-<lang>.png'
         on_press: app.language = '<lang>'
     ```
 * The language should now show up in the app.
diff --git a/README.md b/README.md
index e2c258c..ca0f226 100644
--- a/README.md
+++ b/README.md
@@ -24,15 +24,15 @@
 </td>
 <td>
 
-<a href="https://github.com/sanderland/katrain/blob/master/README.md"><img alt="English" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flaticon/flag-uk.png" width=50></a>
-<a href="https://translate.google.com/translate?sl=en&tl=de&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="German" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flaticon/flag-de.png" width=50></a>
-<a href="https://translate.google.com/translate?sl=en&tl=fr&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="French" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flaticon/flag-fr.png" width=50></a>
-<a href="https://translate.google.com/translate?sl=en&tl=es&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Spanish" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flaticon/flag-es.png" width=50></a>
+<a href="https://github.com/sanderland/katrain/blob/master/README.md"><img alt="English" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flags/flag-uk.png" width=50></a>
+<a href="https://translate.google.com/translate?sl=en&tl=de&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="German" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flags/flag-de.png" width=50></a>
+<a href="https://translate.google.com/translate?sl=en&tl=fr&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="French" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flags/flag-fr.png" width=50></a>
+<a href="https://translate.google.com/translate?sl=en&tl=es&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Spanish" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flags/flag-es.png" width=50></a>
 <br/>
-<a href="https://translate.google.com/translate?sl=en&tl=ru&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Russian" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flaticon/flag-ru.png" width=50></a>
-<a href="https://translate.google.com/translate?sl=en&tl=zh-CN&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Chinese" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flaticon/flag-cn.png" width=50></a>
-<a href="https://translate.google.com/translate?sl=en&tl=ko&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Korean" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flaticon/flag-ko.png" width=50></a>
-<a href="https://translate.google.com/translate?sl=en&tl=ja&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Japanese" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flaticon/flag-jp.png" width=50></a>
+<a href="https://translate.google.com/translate?sl=en&tl=ru&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Russian" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flags/flag-ru.png" width=50></a>
+<a href="https://translate.google.com/translate?sl=en&tl=zh-CN&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Chinese" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flags/flag-cn.png" width=50></a>
+<a href="https://translate.google.com/translate?sl=en&tl=ko&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Korean" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flags/flag-ko.png" width=50></a>
+<a href="https://translate.google.com/translate?sl=en&tl=ja&u=https%3A%2F%2Fgithub.com%2Fsanderland%2Fkatrain%2Fblob%2Fmaster%2FREADME.md"><img alt="Japanese" src="https://github.com/sanderland/katrain/blob/master/katrain/img/flags/flag-jp.png" width=50></a>
 
 </td>
 </table>
diff --git a/katrain/gui.kv b/katrain/gui.kv
index 0ff2a34..480fb22 100644
--- a/katrain/gui.kv
+++ b/katrain/gui.kv
@@ -947,7 +947,12 @@
             text: i18n._('menu:save')
             icon: 'img/Save-Game.png'
             shortcut: 'Ctrl-S'
-            on_action: root.katrain("output-sgf")
+            on_action: root.katrain("save-game")
+        MainMenuItem:
+            text: i18n._('menu:save-as')
+            icon: 'img/Save-Game.png'
+            shortcut: 'Ctrl-Shift-S'
+            on_action: root.katrain("save-game-as")
         MainMenuItem:
             text: i18n._('menu:load')
             icon: 'img/Load-Game.png'
@@ -980,28 +985,28 @@
         height: 1.5 * root.item_height
         padding: CP_PADDING, 0
         LangButton:
-            icon: 'img/flaticon/flag-uk.png'
+            icon: 'img/flags/flag-uk.png'
             on_press: app.language = 'en'
         LangButton:
-            icon: 'img/flaticon/flag-de.png'
+            icon: 'img/flags/flag-de.png'
             on_press: app.language = 'de'
         LangButton:
-            icon: 'img/flaticon/flag-fr.png'
+            icon: 'img/flags/flag-fr.png'
             on_press: app.language = 'fr'
+#        LangButton:
+#            icon: 'img/flags/flag-es.png'
+#            on_press: app.language = 'es'
         LangButton:
-            icon: 'img/flaticon/flag-es.png'
-            on_press: app.language = 'es'
-        LangButton:
-            icon: 'img/flaticon/flag-ru.png'
+            icon: 'img/flags/flag-ru.png'
             on_press: app.language = 'ru'
         LangButton:
-            icon: 'img/flaticon/flag-cn.png'
+            icon: 'img/flags/flag-cn.png'
             on_press: app.language = 'cn'
         LangButton:
-            icon: 'img/flaticon/flag-ko.png'
+            icon: 'img/flags/flag-ko.png'
             on_press: app.language = 'ko'
         LangButton:
-            icon: 'img/flaticon/flag-jp.png'
+            icon: 'img/flags/flag-jp.png'
             on_press: app.language = 'jp'
     BoxLayout:
         size_hint: 1,None
diff --git a/katrain/gui/badukpan.py b/katrain/gui/badukpan.py
index a7a765c..2ddc50e 100644
--- a/katrain/gui/badukpan.py
+++ b/katrain/gui/badukpan.py
@@ -94,7 +94,9 @@ class BadukPanWidget(Widget):
                 near_move = [
                     (pv, node)
                     for move, pv, node in self.active_pv_moves
-                    if abs(rel_pos[0] - self.gridpos_x[move[0]]) < self.grid_size / 2
+                    if move[0] < len(self.gridpos_x)
+                    and move[1] < len(self.gridpos_y)
+                    and abs(rel_pos[0] - self.gridpos_x[move[0]]) < self.grid_size / 2
                     and abs(rel_pos[1] - self.gridpos_y[move[1]]) < self.grid_size / 2
                 ]
                 if near_move:
diff --git a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.mo
index 21a9a17..3459baa 100644
Binary files a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.mo differ
diff --git a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po
index 7fe6945..2f460e6 100644
--- a/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/cn/LC_MESSAGES/katrain.po
@@ -723,3 +723,7 @@ msgstr "Show stats if more than ... visits"
 #. TODO - analysis option
 msgid "cache analysis to sgf"
 msgstr "Cache analysis in SGF"
+
+#. TODO
+msgid "menu:save-as"
+msgstr "Save Game As..."
diff --git a/katrain/i18n/locales/de/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/de/LC_MESSAGES/katrain.mo
index 23986c5..5bd19c4 100644
Binary files a/katrain/i18n/locales/de/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/de/LC_MESSAGES/katrain.mo differ
diff --git a/katrain/i18n/locales/de/LC_MESSAGES/katrain.po b/katrain/i18n/locales/de/LC_MESSAGES/katrain.po
index 9ba985f..bc1ecf7 100644
--- a/katrain/i18n/locales/de/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/de/LC_MESSAGES/katrain.po
@@ -770,3 +770,7 @@ msgid "cache analysis to sgf"
 msgstr ""
 "cache analysis to sgf\n"
 "(larger files, only compatible with KaTrain)"
+
+#. TODO
+msgid "menu:save-as"
+msgstr "Save Game As..."
diff --git a/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo
index 5babd5b..865aa1d 100644
Binary files a/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/en/LC_MESSAGES/katrain.mo differ
diff --git a/katrain/i18n/locales/en/LC_MESSAGES/katrain.po b/katrain/i18n/locales/en/LC_MESSAGES/katrain.po
index cc3b920..1485d38 100644
--- a/katrain/i18n/locales/en/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/en/LC_MESSAGES/katrain.po
@@ -16,6 +16,9 @@ msgstr "New Game"
 msgid "menu:save"
 msgstr "Save Game"
 
+msgid "menu:save-as"
+msgstr "Save Game As..."
+
 msgid "menu:load"
 msgstr "Load Game"
 
diff --git a/katrain/i18n/locales/es/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/es/LC_MESSAGES/katrain.mo
index 5f449a7..ec95bfd 100644
Binary files a/katrain/i18n/locales/es/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/es/LC_MESSAGES/katrain.mo differ
diff --git a/katrain/i18n/locales/es/LC_MESSAGES/katrain.po b/katrain/i18n/locales/es/LC_MESSAGES/katrain.po
index bd9a130..156e2a5 100644
--- a/katrain/i18n/locales/es/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/es/LC_MESSAGES/katrain.po
@@ -783,3 +783,7 @@ msgstr "Show stats if more than ... visits"
 #. TODO - analysis option
 msgid "cache analysis to sgf"
 msgstr "Cache analysis in SGF"
+
+#. TODO
+msgid "menu:save-as"
+msgstr "Save Game As..."
diff --git a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.mo
index 4d2420a..87282c1 100644
Binary files a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.mo differ
diff --git a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po
index 5bd3178..1123176 100644
--- a/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/fr/LC_MESSAGES/katrain.po
@@ -809,3 +809,7 @@ msgstr "Show stats if more than ... visits"
 #. TODO - analysis option
 msgid "cache analysis to sgf"
 msgstr "Cache analysis in SGF"
+
+#. TODO
+msgid "menu:save-as"
+msgstr "Save Game As..."
diff --git a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.mo
index 3f01a38..f1c8e38 100644
Binary files a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.mo differ
diff --git a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po
index 4a7f2aa..a8e523f 100644
--- a/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/jp/LC_MESSAGES/katrain.po
@@ -762,3 +762,7 @@ msgstr "Show stats if more than ... visits"
 #. TODO - analysis option
 msgid "cache analysis to sgf"
 msgstr "Cache analysis in SGF"
+
+#. TODO
+msgid "menu:save-as"
+msgstr "Save Game As..."
diff --git a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.mo
index fe6641c..3c40c7a 100644
Binary files a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.mo differ
diff --git a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po
index 9e47d2d..a7d88ca 100644
--- a/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/ko/LC_MESSAGES/katrain.po
@@ -737,3 +737,7 @@ msgstr "Show stats if more than ... visits"
 #. TODO - analysis option
 msgid "cache analysis to sgf"
 msgstr "ache analysis in SGF"
+
+#. TODO
+msgid "menu:save-as"
+msgstr "Save Game As..."
diff --git a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.mo b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.mo
index 75faa2d..34466ba 100644
Binary files a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.mo and b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.mo differ
diff --git a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po
index 46bca48..7397039 100644
--- a/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po
+++ b/katrain/i18n/locales/ru/LC_MESSAGES/katrain.po
@@ -771,3 +771,7 @@ msgstr "Show stats if more than ... visits"
 #. TODO - analysis option
 msgid "cache analysis to sgf"
 msgstr "Cache analysis in SGF"
+
+#. TODO
+msgid "menu:save-as"
+msgstr "Save Game As..."
diff --git a/katrain/img/flaticon/flag-cn.png b/katrain/img/flags/flag-cn.png
similarity index 100%
rename from katrain/img/flaticon/flag-cn.png
rename to katrain/img/flags/flag-cn.png
diff --git a/katrain/img/flaticon/flag-de.png b/katrain/img/flags/flag-de.png
similarity index 100%
rename from katrain/img/flaticon/flag-de.png
rename to katrain/img/flags/flag-de.png
diff --git a/katrain/img/flaticon/flag-es.png b/katrain/img/flags/flag-es.png
similarity index 100%
rename from katrain/img/flaticon/flag-es.png
rename to katrain/img/flags/flag-es.png
diff --git a/katrain/img/flaticon/flag-fr.png b/katrain/img/flags/flag-fr.png
similarity index 100%
rename from katrain/img/flaticon/flag-fr.png
rename to katrain/img/flags/flag-fr.png
diff --git a/katrain/img/flaticon/flag-jp.png b/katrain/img/flags/flag-jp.png
similarity index 100%
rename from katrain/img/flaticon/flag-jp.png
rename to katrain/img/flags/flag-jp.png
diff --git a/katrain/img/flaticon/flag-ko.png b/katrain/img/flags/flag-ko.png
similarity index 100%
rename from katrain/img/flaticon/flag-ko.png
rename to katrain/img/flags/flag-ko.png
diff --git a/katrain/img/flaticon/flag-ru.png b/katrain/img/flags/flag-ru.png
similarity index 100%
rename from katrain/img/flaticon/flag-ru.png
rename to katrain/img/flags/flag-ru.png
diff --git a/katrain/img/flaticon/flag-uk.png b/katrain/img/flags/flag-uk.png
similarity index 100%
rename from katrain/img/flaticon/flag-uk.png
rename to katrain/img/flags/flag-uk.png
diff --git a/setup.py b/setup.py
index 7cc9736..2ca7be5 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@ include_data_files("katrain/models")
 include_data_files("katrain/fonts")
 include_data_files("katrain/sounds")
 include_data_files("katrain/img/")
-include_data_files("katrain/img/flaticon")
+include_data_files("katrain/img/flags")
 include_data_files("katrain/i18n")
 
 print(packages, package_data)