diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 364f5755d8..091f66f9eb 100644
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -203,22 +203,22 @@ static void show_vrf_proto_rm(struct vty *vty, struct zebra_vrf *zvrf,
 {
 	int i;
 
-	vty_out(vty, "Protocol    : route-map\n");
-	vty_out(vty, "------------------------\n");
+	vty_out(vty, "Protocol                  : route-map\n");
+	vty_out(vty, "-------------------------------------\n");
 
 	for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
 		if (PROTO_RM_NAME(zvrf, af_type, i))
-			vty_out(vty, "%-10s  : %-10s\n", zebra_route_string(i),
+			vty_out(vty, "%-24s  : %-10s\n", zebra_route_string(i),
 				PROTO_RM_NAME(zvrf, af_type, i));
 		else
-			vty_out(vty, "%-10s  : none\n", zebra_route_string(i));
+			vty_out(vty, "%-24s  : none\n", zebra_route_string(i));
 	}
 
 	if (PROTO_RM_NAME(zvrf, af_type, i))
-		vty_out(vty, "%-10s  : %-10s\n", "any",
+		vty_out(vty, "%-24s  : %-10s\n", "any",
 			PROTO_RM_NAME(zvrf, af_type, i));
 	else
-		vty_out(vty, "%-10s  : none\n", "any");
+		vty_out(vty, "%-24s  : none\n", "any");
 }
 
 static void show_vrf_nht_rm(struct vty *vty, struct zebra_vrf *zvrf,
@@ -226,22 +226,22 @@ static void show_vrf_nht_rm(struct vty *vty, struct zebra_vrf *zvrf,
 {
 	int i;
 
-	vty_out(vty, "Protocol    : route-map\n");
-	vty_out(vty, "------------------------\n");
+	vty_out(vty, "Protocol                  : route-map\n");
+	vty_out(vty, "-------------------------------------\n");
 
 	for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
 		if (NHT_RM_NAME(zvrf, af_type, i))
-			vty_out(vty, "%-10s  : %-10s\n", zebra_route_string(i),
+			vty_out(vty, "%-24s  : %-10s\n", zebra_route_string(i),
 				NHT_RM_NAME(zvrf, af_type, i));
 		else
-			vty_out(vty, "%-10s  : none\n", zebra_route_string(i));
+			vty_out(vty, "%-24s  : none\n", zebra_route_string(i));
 	}
 
 	if (NHT_RM_NAME(zvrf, af_type, i))
-		vty_out(vty, "%-10s  : %-10s\n", "any",
+		vty_out(vty, "%-24s  : %-10s\n", "any",
 			NHT_RM_NAME(zvrf, af_type, i));
 	else
-		vty_out(vty, "%-10s  : none\n", "any");
+		vty_out(vty, "%-24s  : none\n", "any");
 }
 
 static int show_proto_rm(struct vty *vty, int af_type, const char *vrf_all,
diff --git a/zebra/zserv.c b/zebra/zserv.c
index b0991e98f8..419f30e6d3 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -914,7 +914,7 @@ static void zebra_show_client_detail(struct vty *vty, struct zserv *client)
 			zserv_command_string(last_write_cmd));
 	vty_out(vty, "\n");
 
-	vty_out(vty, "Type        Add        Update     Del \n");
+	vty_out(vty, "Type        Add         Update      Del \n");
 	vty_out(vty, "================================================== \n");
 	vty_out(vty, "IPv4        %-12d%-12d%-12d\n", client->v4_route_add_cnt,
 		client->v4_route_upd8_cnt, client->v4_route_del_cnt);
@@ -965,7 +965,7 @@ static void zebra_show_client_brief(struct vty *vty, struct zserv *client)
 	last_write_time = (time_t)atomic_load_explicit(&client->last_write_time,
 						       memory_order_relaxed);
 
-	vty_out(vty, "%-8s%12s %12s%12s%8d/%-8d%8d/%-8d\n",
+	vty_out(vty, "%-10s%12s %12s%12s%8d/%-8d%8d/%-8d\n",
 		zebra_route_string(client->proto),
 		zserv_time_buf(&connect_time, cbuf, ZEBRA_TIME_BUF),
 		zserv_time_buf(&last_read_time, rbuf, ZEBRA_TIME_BUF),
@@ -1019,7 +1019,7 @@ DEFUN (show_zebra_client_summary,
 	struct zserv *client;
 
 	vty_out(vty,
-		"Name    Connect Time    Last Read  Last Write  IPv4 Routes       IPv6 Routes    \n");
+		"Name      Connect Time    Last Read  Last Write  IPv4 Routes       IPv6 Routes    \n");
 	vty_out(vty,
 		"--------------------------------------------------------------------------------\n");