diff --git a/APPL/PDA/gebouw.asp b/APPL/PDA/gebouw.asp
index 4d475a61d1..ad5f18ae88 100644
--- a/APPL/PDA/gebouw.asp
+++ b/APPL/PDA/gebouw.asp
@@ -177,13 +177,25 @@ oRs.Close();
 
     var trackinglines = mobile.hastrackingpage("gebouw", bld_key);
     if (trackinglines > 0 && !tiny)
-        BUTTON(L("lcl_history"), {linkid: "#page-2-"+bld_key, dataicon: "bullets"});
+        BUTTON(L("lcl_history")+" ({0})".format(trackinglines), {linkid: "#bld-2-"+bld_key, dataicon: "bullets"});
+
+      var tsql = "SELECT COUNT(alg_ruimte_key)"
+               + " FROM alg_ruimte r, alg_verdieping v WHERE r.alg_verdieping_key=v.alg_verdieping_key AND alg_ruimte_verwijder IS NULL AND v.alg_gebouw_key = " + bld_key
+      toRs = Oracle.Execute(tsql);
+      if (toRs(0).value > 0) {
+        BUTTON(L("lcl_mobile_ruimten")+" ({0})".format(toRs(0).value), {linkid: "./ruimte_list.asp?bld_key="+bld_key + transitParam, dataicon: "info"});
+      }
+      toRs.Close();
 
     CONTROLGROUP_END();
     CONTENT_END();
     FOOTER();
     PAGE_END();
-
+    if (trackinglines>0) {
+        PAGE_START({id: "bld-2-"+bld_key, dialog: true})
+          mobile.trackingpage('gebouw', bld_key, bld_descr);
+        PAGE_END();
+    }
 %>
 </body>
 </html>
\ No newline at end of file
diff --git a/APPL/PDA/locatie.asp b/APPL/PDA/locatie.asp
index d6b2aa9313..0c23326ce6 100644
--- a/APPL/PDA/locatie.asp
+++ b/APPL/PDA/locatie.asp
@@ -124,12 +124,24 @@ oRs.Close();
 
       var trackinglines = mobile.hastrackingpage("locatie", loc_key);
       if (trackinglines > 0 && !tiny)
-          BUTTON(L("lcl_history"), {linkid: "#page-2-"+loc_key, dataicon: "bullets"});
+          BUTTON(L("lcl_history")+" ({0})".format(trackinglines), {linkid: "#loc-2-"+loc_key, dataicon: "bullets"});
 
+      var tsql = "SELECT COUNT(alg_gebouw_key)"
+               + " FROM alg_gebouw WHERE alg_gebouw_verwijder IS NULL AND alg_locatie_key = " + loc_key
+      toRs = Oracle.Execute(tsql);
+      if (toRs(0).value > 0) {
+        BUTTON(L("lcl_mobile_gebouwen")+" ({0})".format(toRs(0).value), {linkid: "./gebouw_list.asp?loc_key="+loc_key + transitParam, dataicon: "info"});
+      }
+      toRs.Close();
     CONTROLGROUP_END();
     CONTENT_END();
     FOOTER();
     PAGE_END();
+    if (trackinglines>0) {
+        PAGE_START({id: "loc-2-"+bld_key, dialog: true})
+          mobile.trackingpage('locatie', loc_key, loc_code);
+        PAGE_END();
+    }
 
 %>
 </body>