diff --git a/core/section/github/commits_template.go b/core/section/github/commits_template.go
index 701b8d85..9350f9c6 100644
--- a/core/section/github/commits_template.go
+++ b/core/section/github/commits_template.go
@@ -12,58 +12,69 @@
 package github
 
 const commitsTemplate = `
-<h3>Contributor activity since {{.Config.Since}}{{.Config.DateMessage}}</h3>
 <div class="section-github-render">
-	<table style="width:80%">
-		<tr>
-			<th></th>
-    		<th>Author</th>
-			<th>Open Issues</th>
-			<th>Closed Issues</th>
-    		<th>#commits</th>
-    		<th>Branches</th>
-  		</tr>
+
+{{if .HasAuthorStats}}
+
+	<h3>Contributor activity since {{.Config.Since}}{{.Config.DateMessage}}</h3>
+	<table class="contributor-table" style="width: 100%;">
+		<thead>
+			<tr>
+				<th class="title">Contributor</th>
+				<th class="title">Assigned/Closed</th>
+				<th class="title">#Commits</th>
+				<th class="title">Branches</th>
+			</tr>
+		</thead>
+
+		<tbody>
 		{{range $stats := .AuthorStats}}
 			<tr>
-				<td>
+				<td style="width: 20%;">
 					<div class="github-avatar">
 						<img alt="@{{$stats.Author}}" src="{{$stats.Avatar}}" height="36" width="36">
 					</div>
+					{{$stats.Author}}
 				</td>
-				<td>{{$stats.Author}}</td>
-				<td>{{$stats.OpenIssues}}</td>
-				<td>{{$stats.ClosedIssues}}</td>
-				<td>{{$stats.CommitCount}}</td>
-				<td>
+				<td style="width: 15%;">{{$stats.OpenIssues}} / {{$stats.ClosedIssues}}</td>
+				<td style="width: 15%;">{{$stats.CommitCount}}</td>
+				<td style="width: 50%;">
 					{{range $repo := $stats.Repos}}
 						{{$repo}}<br>
 					{{end}}
 				</td>
 			</tr>
 		{{end}}
+		</tbody>
 	</table>
-	<table>
-	{{range $commit := .BranchCommits}}
-		<tr>
-			<td>
-				{{if $commit.ShowRepo}}{{$commit.Repo}}{{end}} 
-			</td>
-			<td>
-				{{if $commit.ShowBranch}}{{$commit.Branch}}{{end}}
-			</td>
-			<td>
-				{{if $commit.ShowDate}}{{$commit.Date}}{{end}}
-			</td>
-			<td>
-				{{if $commit.ShowUser}}
-					<img alt="@{{$commit.Name}}" src="{{$commit.Avatar}}" height="36" width="36"> {{$commit.Name}}
-				{{end}}
-			</td>
-			<td>
-				<a class="link" href="{{$commit.URL}}">{{$commit.Message}}</a>
-			</td>
-		</tr>
-	{{end}}
-	</table>
+{{end}}
+
+{{if .HasCommits}}	
+	<h3>Commits activity since {{.Config.Since}}{{.Config.DateMessage}}</h3>
+		<table>
+		{{range $commit := .BranchCommits}}
+			<tr>
+				<td>
+					{{if $commit.ShowRepo}}{{$commit.Repo}}{{end}}
+				</td>
+				<td>
+					{{if $commit.ShowBranch}}{{$commit.Branch}}{{end}}
+				</td>
+				<td>
+					{{if $commit.ShowDate}}{{$commit.Date}}{{end}}
+				</td>
+				<td>
+					{{if $commit.ShowUser}}
+						<img alt="@{{$commit.Name}}" src="{{$commit.Avatar}}" height="36" width="36"> {{$commit.Name}}
+					{{end}}
+				</td>
+				<td>
+					<a class="link" href="{{$commit.URL}}">{{$commit.Message}}</a>
+				</td>
+			</tr>
+		{{end}}
+		</table>
+{{end}}
+
 </div>
 `
diff --git a/core/section/github/issues_template.go b/core/section/github/issues_template.go
index 2d09a5dc..071b7976 100644
--- a/core/section/github/issues_template.go
+++ b/core/section/github/issues_template.go
@@ -24,6 +24,7 @@ const (
 	`
 	issuesTemplate = `
 <div class="section-github-render">
+{{if .HasIssues}}
 	<h3>Issues: {{.ClosedIssues}} closed, {{.OpenIssues}} open</h3>
 	<p>
 		{{if .ShowList}}
@@ -36,9 +37,25 @@ const (
 		{{end}}
 	</p>
 	<div class="github-board">
-	<ul class="github-list">
+
+
+
+	<table class="issue-table" style="width: 100%;">
+	    <thead>
+	        <tr>
+	            <th class="title">Repository</th>
+	            <th class="title">Milestone</th>
+	            <th class="title">Issues</th>
+	        </tr>
+	    </thead>
+
+	    <tbody>
 		{{range $data := .Issues}}
-			<li class="github-commit-item">
+	        <tr>
+	            <td style="width: 20%;">{{$data.Repo}}</td>
+	            <td style="width: 20%;">{{$data.Milestone}}</td>
+	            <td style="width: 60%;">
+				<li class="github-commit-item">
 				<a class="link" href="{{$data.URL}}">
 					<div class="issue-avatar">
 						{{if $data.IsOpen}}
@@ -46,19 +63,23 @@ const (
 						{{else}}
 							` + closedIsvg + `
 						{{end}}
-				  	</div>
+					</div>
 					<div class="github-commit-body">
-						<div class="github-commit-title"><span class="label-name">{{$data.Repo}} - {{$data.Message}}</span> :{{$data.Milestone}}: {{$data.Labels}}</div>
+						<div class="github-commit-title"><span class="label-name">{{$data.Message}}</span> {{$data.Labels}}</div>
 						<div class="github-commit-meta">
 							#{{$data.ID}} opened on {{$data.Date}} by {{$data.Name}}, last updated {{$data.Updated}}
 						</div>
 					</div>
 				</a>
-				<div class="clearfix" />
-			</li>
+				</li>
+				</td>
+	        </tr>
 		{{end}}
-	</ul>
+	    </tbody>
+
+	</table>
 	</div>
+{{end}}
 </div>
 `
 )
diff --git a/core/section/github/milestones_template.go b/core/section/github/milestones_template.go
index a654134a..9df9b1c3 100644
--- a/core/section/github/milestones_template.go
+++ b/core/section/github/milestones_template.go
@@ -13,14 +13,14 @@ package github
 
 const (
 	rawMSsvg  = `<path d="M8 2H6V0h2v2zm4 5H2c-.55 0-1-.45-1-1V4c0-.55.45-1 1-1h10l2 2-2 2zM8 4H6v2h2V4zM6 16h2V8H6v8z"></path>`
-	openMSsvg = `							
+	openMSsvg = `
 <span title="Open milestone">
 	<svg height="16" width="14" version="1.1" viewBox="0 0 14 16">
 		` + rawMSsvg + `
 	</svg>
 </span>
 `
-	closedMSsvg = `							
+	closedMSsvg = `
 <span title="Closed milestone">
 	<svg height="8" width="7" version="1.1" viewBox="0 0 14 16">
 		` + rawMSsvg + `
@@ -29,36 +29,50 @@ const (
 `
 	milestonesTemplate = `
 <div class="section-github-render">
-	<h3>Milestones: {{.ClosedMS}} closed, {{.OpenMS}} open</h3>
-	<div class="github-board">
-	<ul class="github-list">
-		{{range $data := .Milestones}}
-			<li class="github-commit-item">
-				<a class="link" href="{{$data.URL}}">
-					<div class="issue-avatar">
+
+	{{if .HasMilestones}}
+		<h3>Milestones: {{.ClosedMS}} closed, {{.OpenMS}} open</h3>
+		<div class="github-board">
+		<table class="milestone-table" style="width: 100%;">
+		    <thead>
+		        <tr>
+		            <th class="title">Repository</th>
+		            <th class="title">Milestone</th>
+		            <th class="title">Issue Progress</th>
+					<th class="title">X</th>
+		        </tr>
+		    </thead>
+
+		    <tbody>
+			{{range $data := .Milestones}}
+		        <tr>
+		            <td style="width: 25%;">{{$data.Repo}} </td>
+		            <td style="width: 20%;">{{$data.Name}} <br>
+						{{if $data.IsMilestone}}
+							{{$data.DueDate}} Last updated {{$data.UpdatedAt}}.
+						{{end}}
+					</td>
+		            <td style="width: 45%;">
+						{{if $data.IsMilestone}}
+							<progress value="{{$data.Progress}}" max="100"></progress> <br>
+							{{$data.CompleteMsg}} complete {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
+						{{else}}
+							{{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
+						{{end}}
+					</td>
+					<td style="width: 10%;">
 						{{if $data.IsOpen}}
 							` + openMSsvg + `
 						{{else}}
 							` + closedMSsvg + `
 						{{end}}
-				  	</div>
-					<div class="github-commit-body">
-						<div class="github-commit-title"><span class="label-name">{{$data.Repo}} - {{$data.Name}}</span> 
-						{{if $data.IsMilestone}}
-							<progress value="{{$data.Progress}}" max="100">
-						{{end}}
-						</div>
-						<div class="github-commit-meta">
-						  {{$data.DueDate}} Last updated {{$data.UpdatedAt}}. 
-						  {{$data.CompleteMsg}} complete {{$data.OpenIssues}} open {{$data.ClosedIssues}} closed
-						</div>
-					</div>
-				</a>
-				<div class="clearfix" />
-			</li>
-		{{end}}
-	</ul>
-	</div>
+					</td>
+		        </tr>
+			{{end}}
+		    </tbody>
+		</table>
+		</div>
+	{{end}}
 </div>
 `
 )
diff --git a/core/section/github/summary_template.go b/core/section/github/summary_template.go
index 6e2858a4..674c584e 100644
--- a/core/section/github/summary_template.go
+++ b/core/section/github/summary_template.go
@@ -13,6 +13,7 @@ package github
 
 const summaryTemplate = `
 <div class="section-github-render">
+
 	<h3>
 		Activity since {{.Config.Since}}{{.Config.DateMessage}} for {{.Config.Owner}} repositories:
 		{{range $data := .Config.Lists}}
@@ -23,11 +24,33 @@ const summaryTemplate = `
 			{{end}}
 		{{end}}
 	</h3>
-	<h3>
-		Common Labels: <br>
-		{{range $slabel := .SharedLabels}}
-			{{$slabel.Name}} {{$slabel.Count}} {{$slabel.Repos}} <br>
-		{{end}}
-	</h3>
+
+	{{if .HasSharedLabels}}
+		<h3>
+			Common Labels: <br>
+		</h3>
+
+		<table class="label-table" style="width: 100%;">
+		    <thead>
+		        <tr>
+		            <th class="title">Label</th>
+		            <th class="title">Count</th>
+		            <th class="title">Repositories</th>
+		        </tr>
+		    </thead>
+
+		    <tbody>
+			{{range $slabel := .SharedLabels}}
+		        <tr>
+		            <td style="width: 25%;">{{$slabel.Name}}</td>
+		            <td style="width: 25%;">{{$slabel.Count}}</td>
+		            <td style="width: 50%;">{{$slabel.Repos}}</td>
+		        </tr>
+			{{end}}
+		    </tbody>
+		</table>
+	{{end}}
+
+
 </div>
 `