diff --git a/bazarr/get_argv.py b/bazarr/get_argv.py
index 5a2b27587..5f0ee372f 100644
--- a/bazarr/get_argv.py
+++ b/bazarr/get_argv.py
@@ -2,7 +2,7 @@ import os
 import sys
 import getopt
 
-config_dir = os.path.join(os.path.dirname(__file__), '../data/')
+config_dir = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'data')
 no_update = False
 
 try:
diff --git a/bazarr/main.py b/bazarr/main.py
index 05e94a628..5d39cd610 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -1463,8 +1463,8 @@ def system():
 
     return template('system', __file__=__file__, bazarr_version=bazarr_version,
                     sonarr_version=sonarr_version.json()['version'], radarr_version=radarr_version.json()['version'],
-                    operation_system=platform.platform(), python_version=platform.python_version(),
-                    config_dir=config_dir, bazarr_dir=os.getcwd(),
+                    operating_system=platform.platform(), python_version=platform.python_version(),
+                    config_dir=config_dir, bazarr_dir=os.path.normcase(os.getcwd()),
                     base_url=base_url, task_list=task_list, row_count=row_count, max_page=max_page, page_size=page_size,
                     releases=releases, current_port=port)
 
diff --git a/views/system.tpl b/views/system.tpl
index 903074320..1a28c555f 100644
--- a/views/system.tpl
+++ b/views/system.tpl
@@ -126,7 +126,7 @@
                     <div class="ui grid">
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
-                                <label>Version</label>
+                                <label>Bazarr version</label>
                             </div>
                             <div class="five wide column">
                                 <div class='field'>
@@ -136,18 +136,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="middle aligned row">
-                            <div class="right aligned four wide column">
-                                <label>Operation system</label>
-                            </div>
-                            <div class="five wide column">
-                                <div class='field'>
-                                    <div class="ui fluid input">
-                                        {{operation_system}}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                         % from get_settings import get_general_settings
                         % if get_general_settings()[12]:
                         <div class="middle aligned row">
@@ -177,6 +165,18 @@
                             </div>
                         </div>
                         % end
+                        <div class="middle aligned row">
+                            <div class="right aligned four wide column">
+                                <label>Operating system</label>
+                            </div>
+                            <div class="five wide column">
+                                <div class='field'>
+                                    <div class="ui fluid input">
+                                        {{operating_system}}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
                                 <label>Python version</label>
@@ -189,18 +189,6 @@
                                 </div>
                             </div>
                         </div>
-                        <div class="middle aligned row">
-                            <div class="right aligned four wide column">
-                                <label>Bazarr config dir</label>
-                            </div>
-                            <div class="five wide column">
-                                <div class='field'>
-                                    <div class="ui fluid input">
-                                        {{config_dir}}
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                         <div class="middle aligned row">
                             <div class="right aligned four wide column">
                                 <label>Bazarr directory</label>
@@ -213,6 +201,18 @@
                                 </div>
                             </div>
                         </div>
+                        <div class="middle aligned row">
+                            <div class="right aligned four wide column">
+                                <label>Bazarr config directory</label>
+                            </div>
+                            <div class="five wide column">
+                                <div class='field'>
+                                    <div class="ui fluid input">
+                                        {{config_dir}}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="ui dividing header">More info</div>