diff --git a/include/ejabberd_web_admin.hrl b/include/ejabberd_web_admin.hrl
index 1f2262051..c8b86e120 100644
--- a/include/ejabberd_web_admin.hrl
+++ b/include/ejabberd_web_admin.hrl
@@ -93,9 +93,9 @@
 -define(GL(Ref, Title),
 	?XAE(<<"div">>, [{<<"class">>, <<"guidelink">>}],
 	     [?XAE(<<"a">>,
-		   [{<<"href">>, <<"https://docs.ejabberd.im/admin/configuration/#", Ref/binary>>},
+		   [{<<"href">>, <<"https://docs.ejabberd.im/admin/configuration/", Ref/binary>>},
 		    {<<"target">>, <<"_blank">>}],
-		   [?C(<<"[Guide: ", Title/binary, "]">>)])])).
+		   [?C(<<"docs: ", Title/binary>>)])])).
 
 %% h1 with a Guide Link
 -define(H1GL(Name, Ref, Title),
diff --git a/priv/css/admin.css b/priv/css/admin.css
index e07678391..178fc1016 100644
--- a/priv/css/admin.css
+++ b/priv/css/admin.css
@@ -243,7 +243,6 @@ p[dir=ltr] a {
 
   background: #3eaffa;
 
-  text-transform: uppercase;
   font-size: 0.75em;
   color: #fff;
 }
diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl
index b5bc4b15a..eb3d6a679 100644
--- a/src/ejabberd_web_admin.erl
+++ b/src/ejabberd_web_admin.erl
@@ -444,7 +444,7 @@ process_admin(_Host, #request{path = [<<"additions.js">>]}, _) ->
 process_admin(global, #request{path = [<<"vhosts">>], lang = Lang}, AJID) ->
     Res = list_vhosts(Lang, AJID),
     make_xhtml((?H1GL((translate:translate(Lang, ?T("Virtual Hosts"))),
-		      <<"virtual-hosting">>, ?T("Virtual Hosting")))
+		      <<"basic/#xmpp-domains">>, ?T("XMPP Domains")))
 		 ++ Res,
 	       global, Lang, AJID, 1);
 process_admin(Host,  #request{path = [<<"users">>], q = Query,
@@ -479,7 +479,7 @@ process_admin(Host, #request{path = [<<"last-activity">>],
 		list_last_activity(Host, Lang, false, Month);
 	    _ -> list_last_activity(Host, Lang, true, Month)
 	  end,
-    PageH1 = ?H1GL(translate:translate(Lang, ?T("Users Last Activity")), <<"mod-last">>, <<"mod_last">>),
+    PageH1 = ?H1GL(translate:translate(Lang, ?T("Users Last Activity")), <<"modules/#mod-last">>, <<"mod_last">>),
     make_xhtml(PageH1 ++
 		 [?XAE(<<"form">>,
 		       [{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
@@ -510,7 +510,7 @@ process_admin(Host, #request{path = [<<"last-activity">>],
 	       Host, Lang, AJID, 3);
 process_admin(Host, #request{path = [<<"stats">>], lang = Lang}, AJID) ->
     Res = get_stats(Host, Lang),
-    PageH1 = ?H1GL(translate:translate(Lang, ?T("Statistics")), <<"mod-stats">>, <<"mod_stats">>),
+    PageH1 = ?H1GL(translate:translate(Lang, ?T("Statistics")), <<"modules/#mod-stats">>, <<"mod_stats">>),
     Level = case Host of
 	global -> 1;
 	_ -> 3
diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl
index 3c6450980..78eca8e17 100644
--- a/src/mod_muc_admin.erl
+++ b/src/mod_muc_admin.erl
@@ -459,7 +459,7 @@ web_page_main(_, #request{path=[<<"muc">>], lang = Lang} = _Request) ->
 				  Acc + mod_muc:count_online_rooms(Host)
 			  end, 0, find_hosts(global)),
     PageTitle = translate:translate(Lang, ?T("Multi-User Chat")),
-    Res = ?H1GL(PageTitle, <<"mod-muc">>, <<"mod_muc">>) ++
+    Res = ?H1GL(PageTitle, <<"modules/#mod-muc">>, <<"mod_muc">>) ++
 	  [?XCT(<<"h3">>, ?T("Statistics")),
 	   ?XAE(<<"table">>, [],
 		[?XE(<<"tbody">>, [?TDTD(?T("Total rooms"), OnlineRoomsNumber)
@@ -533,7 +533,7 @@ make_rooms_page(Host, Lang, {Sort_direction, Sort_column}) ->
 	  1,
 	  Titles),
     PageTitle = translate:translate(Lang, ?T("Multi-User Chat")),
-    ?H1GL(PageTitle, <<"mod-muc">>, <<"mod_muc">>) ++
+    ?H1GL(PageTitle, <<"modules/#mod-muc">>, <<"mod_muc">>) ++
     [?XCT(<<"h2">>, ?T("Chatrooms")),
      ?XE(<<"table">>,
 	 [?XE(<<"thead">>,
diff --git a/src/mod_offline.erl b/src/mod_offline.erl
index 9021a08df..7c4f8f7e4 100644
--- a/src/mod_offline.erl
+++ b/src/mod_offline.erl
@@ -989,7 +989,7 @@ user_queue(User, Server, Query, Lang) ->
     Hdrs = get_messages_subset(User, Server, HdrsAll),
     FMsgs = format_user_queue(Hdrs),
     PageTitle = str:format(translate:translate(Lang, ?T("~ts's Offline Messages Queue")), [us_to_list(US)]),
-    (?H1GL(PageTitle, <<"mod-offline">>, <<"mod_offline">>))
+    (?H1GL(PageTitle, <<"modules/#mod-offline">>, <<"mod_offline">>))
       ++ [?XREST(?T("Submitted"))] ++
 	[?XAE(<<"form">>,
 	      [{<<"action">>, <<"">>}, {<<"method">>, <<"post">>}],
diff --git a/src/mod_roster.erl b/src/mod_roster.erl
index cccc7e3f4..54abdefad 100644
--- a/src/mod_roster.erl
+++ b/src/mod_roster.erl
@@ -1005,7 +1005,7 @@ user_roster(User, Server, Query, Lang) ->
 					SItems)))])]
 	     end,
     PageTitle = str:format(translate:translate(Lang, ?T("Roster of ~ts")), [us_to_list(US)]),
-    (?H1GL(PageTitle, <<"mod-roster">>, <<"mod_roster">>))
+    (?H1GL(PageTitle, <<"modules/#mod-roster">>, <<"mod_roster">>))
       ++
       case Res of
 	ok -> [?XREST(?T("Submitted"))];