diff --git a/src/bbstool.scm b/src/bbstool.scm
index b26921a..e77e2a2 100644
--- a/src/bbstool.scm
+++ b/src/bbstool.scm
@@ -75,27 +75,30 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 	   (print license-text)
 	   (exit 0))
  ""
- "Test"
- ""
+ "Configuration options:"
  (-members (dir) "Members base directory" (*members-directory* dir))
  (-context (n) "Member-File parser Error Context (lines)" (*member-file-context* (string->number n)))
+ (-month (YYYY-MM) "Specify current month"
+	 (*current-month* (string->month YYYY-MM)))
+ (-tstyle (style) "Use given table style: debug, ascii, unicode"
+	  (*table-border-style* (string->symbol style)))
+ ""
+ "Query options:"
  (-mi (id) "Specify member by id" (-member-id- (string->number id)))
  (-mn (nick) "Specify member by nick" (-member-nick- nick))
+ ""
+ "Actions:"
  (-info () "Print information"
 	(-needs-bank- #t)
 	(-action- 'print-info))
  (-stats (file:gnuplot-data) "Get stats for all months"
 	 (-action- 'print-stats)
 	 (-fname- file:gnuplot-data))
- (-month (YYYY-MM) "Specify current month"
-	 (*current-month* (string->month YYYY-MM)))
  (-print () "Print given member file"
 	 (-action- 'print-member-file))
  (-tests () "Run self-tests upon startup" (-run-tests?- #t))
  (-idstats () "Returns information about available member ids" (-action- 'print-idstats))
  (-genid () "Generates random member id" (-action- 'genid))
- (-tstyle (style) "Use given table style: debug, ascii, unicode"
-	  (*table-border-style* (string->symbol style)))
  (-gencards (file:cards file:desfires) "Generates brmdoor-compatible card files"
 	    (-action- 'gencards)
 	    (-fname- (list file:cards file:desfires)))
@@ -103,13 +106,13 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  (-fees () "Prints fees table"
 	(-needs-bank- #t)
 	(-action- 'fees))
- (-repl () "Start repl with everything loaded"
-	(-needs-bank- #t)
-	(-action- 'repl))
  (-genweb (dir) "Generate static web files"
 	  (-needs-bank- #t)
 	  (-web-dir- dir)
 	  (-action- 'genweb))
+ (-repl () "Start REPL with everything loaded"
+	(-needs-bank- #t)
+	(-action- 'repl))
  )
 
 ;; Run tests