diff --git a/templates/org/worktime.tmpl b/templates/org/worktime.tmpl
index bbe617bb65e..ce20e8e1948 100644
--- a/templates/org/worktime.tmpl
+++ b/templates/org/worktime.tmpl
@@ -2,7 +2,7 @@
 <div class="page-content organization times">
 	{{template "org/header" .}}
 	<div class="ui container">
-		<div class="ui grid">
+		<div class="ui stackable grid">
 			<div class="three wide column">
 				<form class="ui form" method="get">
 					<input type="hidden" name="by" value="{{$.WorktimeBy}}">
@@ -18,13 +18,11 @@
 				</form>
 			</div>
 			<div class="thirteen wide column">
-				<div class="ui column">
-					<div class="ui compact small menu">
-						{{$queryParams := QueryBuild "from" .RangeFrom "to" .RangeTo}}
-						<a class="{{Iif .WorktimeByRepos "active"}} item" href="{{$.Org.OrganisationLink}}/worktime?by=repos&{{$queryParams}}">{{svg "octicon-repo"}} {{ctx.Locale.Tr "org.worktime.by_repositories"}}</a>
-						<a class="{{Iif .WorktimeByMilestones "active"}} item" href="{{$.Org.OrganisationLink}}/worktime?by=milestones&{{$queryParams}}">{{svg "octicon-milestone"}} {{ctx.Locale.Tr "org.worktime.by_milestones"}}</a>
-						<a class="{{Iif .WorktimeByMembers "active"}} item" href="{{$.Org.OrganisationLink}}/worktime?by=members&{{$queryParams}}">{{svg "octicon-people"}} {{ctx.Locale.Tr "org.worktime.by_members"}}</a>
-					</div>
+				<div class="ui compact small menu tw-overflow-scroll">
+					{{$queryParams := QueryBuild "from" .RangeFrom "to" .RangeTo}}
+					<a class="{{Iif .WorktimeByRepos "active"}} item" href="{{$.Org.OrganisationLink}}/worktime?by=repos&{{$queryParams}}">{{svg "octicon-repo"}} {{ctx.Locale.Tr "org.worktime.by_repositories"}}</a>
+					<a class="{{Iif .WorktimeByMilestones "active"}} item" href="{{$.Org.OrganisationLink}}/worktime?by=milestones&{{$queryParams}}">{{svg "octicon-milestone"}} {{ctx.Locale.Tr "org.worktime.by_milestones"}}</a>
+					<a class="{{Iif .WorktimeByMembers "active"}} item" href="{{$.Org.OrganisationLink}}/worktime?by=members&{{$queryParams}}">{{svg "octicon-people"}} {{ctx.Locale.Tr "org.worktime.by_members"}}</a>
 				</div>
 				{{if .WorktimeByRepos}}
 					{{template "org/worktime/table_repos" dict "Org" .Org "WorktimeSumResult" .WorktimeSumResult}}
diff --git a/templates/org/worktime/table_members.tmpl b/templates/org/worktime/table_members.tmpl
index d2721d40854..be8c81af6e7 100644
--- a/templates/org/worktime/table_members.tmpl
+++ b/templates/org/worktime/table_members.tmpl
@@ -8,7 +8,7 @@
 	<tbody>
 		{{range $.WorktimeSumResult}}
 		<tr>
-			<td>{{svg "octicon-person"}} <a href="{{AppSubUrl}}/{{PathEscape .UserName}}">{{.UserName}}</a></td>
+			<td class="tw-break-anywhere">{{svg "octicon-person"}} <a href="{{AppSubUrl}}/{{PathEscape .UserName}}">{{.UserName}}</a></td>
 			<td>{{svg "octicon-clock"}} {{.SumTime | Sec2Hour}}</td>
 		</tr>
 		{{else}}
diff --git a/templates/org/worktime/table_milestones.tmpl b/templates/org/worktime/table_milestones.tmpl
index 3421198b355..b03155242f8 100644
--- a/templates/org/worktime/table_milestones.tmpl
+++ b/templates/org/worktime/table_milestones.tmpl
@@ -9,12 +9,12 @@
 	<tbody>
 		{{range $.WorktimeSumResult}}
 		<tr>
-			<td>
+			<td class="tw-break-anywhere">
 				{{if not .HideRepoName}}
 					{{svg "octicon-repo"}} <a href="{{$.Org.HomeLink}}/{{PathEscape .RepoName}}/issues">{{.RepoName}}</a>
 				{{end}}
 			</td>
-			<td>
+			<td class="tw-break-anywhere">
 				{{if .MilestoneName}}
 					{{svg "octicon-milestone"}} <a href="{{$.Org.HomeLink}}/{{PathEscape .RepoName}}/milestone/{{.MilestoneID}}">{{.MilestoneName}}</a>
 				{{else}}
diff --git a/templates/org/worktime/table_repos.tmpl b/templates/org/worktime/table_repos.tmpl
index 8c62646676d..32afaff7a36 100644
--- a/templates/org/worktime/table_repos.tmpl
+++ b/templates/org/worktime/table_repos.tmpl
@@ -8,7 +8,7 @@
 	<tbody>
 		{{range $.WorktimeSumResult}}
 		<tr>
-			<td>{{svg "octicon-repo"}} <a href="{{$.Org.HomeLink}}/{{PathEscape .RepoName}}/issues">{{.RepoName}}</a></td>
+			<td class="tw-break-anywhere">{{svg "octicon-repo"}} <a href="{{$.Org.HomeLink}}/{{PathEscape .RepoName}}/issues">{{.RepoName}}</a></td>
 			<td>{{svg "octicon-clock"}} {{.SumTime | Sec2Hour}}</td>
 		</tr>
 		{{else}}