diff --git a/src/zabapgit_page_stage.prog.abap b/src/zabapgit_page_stage.prog.abap
index 4bac565d5..eeb1debe2 100644
--- a/src/zabapgit_page_stage.prog.abap
+++ b/src/zabapgit_page_stage.prog.abap
@@ -27,8 +27,8 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page_super.
       render_list
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html_helper,
       render_file
-        IMPORTING is_file     TYPE ty_file
-                  iv_context  TYPE string
+        IMPORTING is_file        TYPE ty_file
+                  iv_context     TYPE string
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html_helper,
       render_menu
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html_helper,
@@ -38,7 +38,7 @@ CLASS lcl_gui_page_stage DEFINITION FINAL INHERITING FROM lcl_gui_page_super.
         RETURNING VALUE(ro_html) TYPE REF TO lcl_html_helper.
 
     METHODS process_stage_list
-      IMPORTING it_postdata  TYPE cnht_post_data_tab
+      IMPORTING it_postdata TYPE cnht_post_data_tab
       RAISING   lcx_exception.
 
 ENDCLASS.
@@ -94,7 +94,7 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
 
     DATA: lv_string TYPE string,
           lt_fields TYPE tihttpnvp,
-          ls_file TYPE ty_file.
+          ls_file   TYPE ty_file.
 
     FIELD-SYMBOLS: <ls_file> LIKE LINE OF ms_files-local,
                    <ls_item> LIKE LINE OF lt_fields.
@@ -151,8 +151,10 @@ CLASS lcl_gui_page_stage IMPLEMENTATION.
       AT FIRST.
         ro_html->add('<thead><tr>').
         ro_html->add('<th></th><th colspan="2">LOCAL</th><th>' ).
-        ro_html->add_anchor( iv_txt = |{ lines( ms_files-local ) } diffs|
-                             iv_act = |{ gc_action-go_diff }?key={ mo_repo->get_key( ) }| ).
+        IF lines( ms_files-local ) > 1.
+          ro_html->add_anchor( iv_txt = |{ lines( ms_files-local ) } diffs|
+                               iv_act = |{ gc_action-go_diff }?key={ mo_repo->get_key( ) }| ).
+        ENDIF.
         ro_html->add('</th></tr></thead>').
         ro_html->add('<tbody class="local">').
       ENDAT.
diff --git a/src/zabapgit_view_repo.prog.abap b/src/zabapgit_view_repo.prog.abap
index 1c8d5b091..e912850a9 100644
--- a/src/zabapgit_view_repo.prog.abap
+++ b/src/zabapgit_view_repo.prog.abap
@@ -30,9 +30,9 @@ CLASS lcl_repo_content_browser DEFINITION FINAL.
       IMPORTING io_repo TYPE REF TO lcl_repo.
 
     METHODS list
-      IMPORTING iv_path         TYPE string
-                iv_by_folders   TYPE abap_bool
-                iv_changes_only TYPE abap_bool
+      IMPORTING iv_path              TYPE string
+                iv_by_folders        TYPE abap_bool
+                iv_changes_only      TYPE abap_bool
       RETURNING VALUE(rt_repo_items) TYPE tt_repo_items
       RAISING   lcx_exception.
 
@@ -57,7 +57,7 @@ CLASS lcl_repo_content_browser DEFINITION FINAL.
       RAISING   lcx_exception.
 
     METHODS filter_changes
-      CHANGING  ct_repo_items TYPE tt_repo_items.
+      CHANGING ct_repo_items TYPE tt_repo_items.
 
 ENDCLASS. "lcl_repo_content_browser
 
@@ -232,7 +232,7 @@ CLASS lcl_gui_view_repo_content DEFINITION FINAL INHERITING FROM lcl_gui_page_su
                END OF c_actions.
 
     METHODS: lif_gui_page~render     REDEFINITION,
-             lif_gui_page~on_event   REDEFINITION.
+      lif_gui_page~on_event   REDEFINITION.
 
     METHODS constructor
       IMPORTING iv_key TYPE lcl_persistence_repo=>ty_repo-key
@@ -333,13 +333,13 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
     TRY.
         ro_html->add( render_repo_menu( ) ).
 
-        CREATE OBJECT lo_browser EXPORTING io_repo   = mo_repo.
+        CREATE OBJECT lo_browser EXPORTING io_repo = mo_repo.
         lt_repo_items = lo_browser->list( iv_path         = mv_cur_dir
                                           iv_by_folders   = mv_show_folders
                                           iv_changes_only = mv_changes_only ).
 
         lo_log = lo_browser->get_log( ).
-        IF mo_repo->is_offline( ) = abap_false and lo_log->count( ) > 0.
+        IF mo_repo->is_offline( ) = abap_false AND lo_log->count( ) > 0.
           ro_html->add( '<div class="log attention">' ).
           ro_html->add( lo_log->to_html( ) ). " shows eg. list of unsupported objects
           ro_html->add( '</div>' ).
@@ -523,7 +523,7 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
 
     IF is_item-is_dir = abap_true.
       APPEND 'folder' TO lt_class.
-    ElSEIF is_item-changes > 0.
+    ELSEIF is_item-changes > 0.
       APPEND 'modified' TO lt_class.
     ELSEIF is_item-obj_name IS INITIAL.
       APPEND 'unsupported' TO lt_class.
@@ -604,9 +604,15 @@ CLASS lcl_gui_view_repo_content IMPLEMENTATION.
           lv_difflink = lcl_html_action_utils=>obj_encode(
             iv_key    = mo_repo->get_key( )
             ig_object = is_item ).
-          ro_html->add_anchor(
-            iv_txt = |{ is_item-changes } diffs|
-            iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
+          IF is_item-changes = 1.
+            ro_html->add_anchor(
+              iv_txt = |{ is_item-changes } diff|
+              iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
+          ELSE.
+            ro_html->add_anchor(
+              iv_txt = |{ is_item-changes } diffs|
+              iv_act = |{ gc_action-go_diff }?{ lv_difflink }| ).
+          ENDIF.
         ELSE.
           LOOP AT is_item-files INTO ls_file.
             IF ls_file-new = gc_new-remote.