+++ Changed menu settings
+++ Fixed bugs