diff --git a/CHANGELOG.md b/CHANGELOG.md
index c273a347..6d78392f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Menu optimized
 ### Added
 - GEXF format
 ## [0.8] - 2020-08-19
diff --git a/pyrgg/__main__.py b/pyrgg/__main__.py
index 86b135fe..0977629d 100644
--- a/pyrgg/__main__.py
+++ b/pyrgg/__main__.py
@@ -63,7 +63,8 @@ def run():
     second_time = time.perf_counter()
     elapsed_time = second_time - first_time
     elapsed_time_format = time_convert(str(elapsed_time))
-    print("Graph Generated In " + elapsed_time_format)
+    print("Total Number of Edges : " + str(edge_number))
+    print("Graph Generated in " + elapsed_time_format)
     print("Where --> " + SOURCE_DIR)
     logger(
         vertices_number,
diff --git a/pyrgg/params.py b/pyrgg/params.py
index 928bd867..2714c889 100644
--- a/pyrgg/params.py
+++ b/pyrgg/params.py
@@ -11,8 +11,8 @@
 MENU_ITEMS2 = {"vertices": "- Vertices Number : ",
                "max_weight": "- Max Weight : ",
                "min_weight": "- Min Weight : ",
-               "min_edge": "- Min Edge Number :",
-               "max_edge": "- Max Edge Number :",
+               "min_edge": "- Min Edge Number : ",
+               "max_edge": "- Max Edge Number : ",
                "sign": "- Signed[1] or Unsigned[2]",
                "direct": "- Directed[1] or Undirected[2]",
                "self_loop": "- Self Loop[1] or No Self Loop[2]",
diff --git a/pyrgg/pyrgg.py b/pyrgg/pyrgg.py
index 48bcd5be..3e84ea7c 100644
--- a/pyrgg/pyrgg.py
+++ b/pyrgg/pyrgg.py
@@ -1306,12 +1306,12 @@ def gexf_maker(
     weight_dic = dicts[1]
     edge_number = dicts[2]
     header = '<?xml version="1.0" encoding="UTF-8"?>\n'
-    header +='<gexf xmlns="http://www.gexf.net/1.2draft" version="1.2">\n'
+    header += '<gexf xmlns="http://www.gexf.net/1.2draft" version="1.2">\n'
     date = datetime.datetime.now().date()
-    meta = '    <meta lastmodifieddate="{0}">\n'.format(date)
-    meta +='        <creator>PyRGG</creator>\n'
-    meta +='        <description>{0}</description>\n'.format(file_name)
-    meta +='    </meta>\n'
+    meta = " " * 4 + '<meta lastmodifieddate="{0}">\n'.format(date)
+    meta += " " * 8 + '<creator>PyRGG</creator>\n'
+    meta += " " * 8 + '<description>{0}</description>\n'.format(file_name)
+    meta += " " * 4 + '</meta>\n'
     file.write(header)
     file.write(meta)
     if direct == 1:
@@ -1319,34 +1319,34 @@ def gexf_maker(
     else:
         defaultedgetype = "undirected"
     file.write(
-        '    <graph defaultedgetype="' + defaultedgetype + '">\n'
+        " " * 4 + '<graph defaultedgetype="' + defaultedgetype + '">\n'
     )
-    file.write("      <nodes>\n")
+    file.write(" " * 8 + "<nodes>\n")
     for i in edge_dic.keys():
         file.write(
-            "        " +
+            " " * 12 +
             '<node id="' +
-            str (i) + '"' +
+            str(i) + '"' +
             ' label="Node {0}" />'.format(
-            str(i)) + "\n")
-    file.write("      </nodes>\n")
-    file.write("      <edges>\n")
+                str(i)) + "\n")
+    file.write(" " * 8 + "</nodes>\n")
+    file.write(" " * 8 + "<edges>\n")
     edge_id = 1
     for i in edge_dic.keys():
         for j, value in enumerate(edge_dic[i]):
             file.write(
-                "        " +
+                " " * 12 +
                 '<edge id="' +
-                str (edge_id) + '"' +
+                str(edge_id) + '"' +
                 ' source="' +
                 str(i) + '"'
                 ' target="' +
                 str(value) + '"' +
                 ' weight="{0}" />'.format(
-                str(weight_dic[i][j])) + "\n")
+                    str(weight_dic[i][j])) + "\n")
             edge_id += 1
-    file.write("      </edges>\n")
-    file.write("    </graph>\n")
+    file.write(" " * 8 + "</edges>\n")
+    file.write(" " * 4 + "</graph>\n")
     file.write("</gexf>")
     file.close()
     return edge_number
diff --git a/pyrgg/test.py b/pyrgg/test.py
index b129e242..737dce25 100644
--- a/pyrgg/test.py
+++ b/pyrgg/test.py
@@ -1268,7 +1268,7 @@
 >>> input_dic['vertices']
 20
 >>> input_dic['min_edge']
-19
+20
 >>> input_dic['min_weight']
 1
 >>> input_dic['output_format']
@@ -1278,7 +1278,7 @@
 >>> input_dic['file_name']
 '14'
 >>> input_dic['max_edge']
-19
+20
 >>> random.seed(2)
 >>> tgf_maker('testfile', 0, 200, 10, 0, 2, 0, 1, 1,1)
 7
diff --git a/test/test.py b/test/test.py
index 600f0e60..894e3d5a 100644
--- a/test/test.py
+++ b/test/test.py
@@ -1687,7 +1687,7 @@
 >>> input_dic['vertices']
 20
 >>> input_dic['min_edge']
-19
+20
 >>> input_dic['min_weight']
 1
 >>> input_dic['output_format']
@@ -1697,7 +1697,7 @@
 >>> input_dic['file_name']
 '14'
 >>> input_dic['max_edge']
-19
+20
 >>> random.seed(2)
 >>> tgf_maker('testfile', 0, 200, 10, 0, 2, 0, 1,1,1)
 7