diff --git a/app/app/styles/section/trello.scss b/app/app/styles/section/trello.scss
index 94906605..7f57783c 100644
--- a/app/app/styles/section/trello.scss
+++ b/app/app/styles/section/trello.scss
@@ -1,38 +1,55 @@
 .section-trello-editor {
+    .section-trello-board {
+        width: 100%;
+        padding: 10px;
+        white-space: nowrap;
+        overflow: auto
+    }
 
-}
+    .section-trello-board-title {
+        font-weight: bold;
+        color: #fff;
+        font-size: 16px;
+    }
 
+    .section-trello-list {
+        background-color: #e2e4e6;
+        padding: 10px;
+        border-radius: 3px;
+        margin: 10px 10px 0 0;
+        max-width: 300px;
+    }
 
-.section-trello-board {
-    width: 100%;
-    padding: 10px;
-    white-space: nowrap;
-    overflow: auto
-}
+    .section-trello-list-title {
+        font-weight: bold;
+        color: #4c4c4c;
+        font-size: 14px;
+        margin: 5px;
+    }
 
-.section-trello-board-title {
-    font-weight: bold;
-    color: #fff;
-    font-size: 16px;
-}
+    .section-trello-list-checkbox {
+        vertical-align: text-bottom;
+    }
 
-.section-trello-list {
-    background-color: #e2e4e6;
-    padding: 10px;
-    border-radius: 3px;
-    margin: 10px 10px 0 0;
-    max-width: 300px;
-}
+    .trello-list {
+        margin-bottom: 10px;
 
-.section-trello-list-title {
-    font-weight: bold;
-    color: #4c4c4c;
-    font-size: 14px;
-    margin: 5px;
-}
+        i {
+            vertical-align: middle;
+        }
+
+        .trello-label {
+            font-size: 11px;
+            color: #fff;
+            padding: 0 8px;
+            margin-right: 5px;
+            border-radius: 2px;
+            box-shadow: inset 0 -1px 0 rgba(0,0,0,.12);
+            display: inline-block;
+            line-height: 22px;
+        }
+    }
 
-.section-trello-list-checkbox {
-    vertical-align: text-bottom;
 }
 
 .section-trello-render {
diff --git a/app/app/templates/components/section/trello/type-editor.hbs b/app/app/templates/components/section/trello/type-editor.hbs
index 980bac57..5eb38373 100644
--- a/app/app/templates/components/section/trello/type-editor.hbs
+++ b/app/app/templates/components/section/trello/type-editor.hbs
@@ -2,6 +2,8 @@
 	tip="Trello is the visual way to manage your projects and organize anything (https://trello.com)"
 	isDirty=(action 'isDirty') onCancel=(action 'onCancel') onAction=(action 'onAction')}}
 
+<div class="section-trello-editor">
+
 	{{#if authenticated}}
 		{{#if noBoards}}
 				<div class="input-control">
@@ -9,7 +11,7 @@
 				</div>
 		{{else}}
 
-			<div class="pull-left width-50">
+			<div class="pull-left width-45">
 				<div class="input-form">
 					<div class="heading">
 						<div class="title">Select Board &amp; Lists</div>
@@ -23,16 +25,16 @@
 					<div class="input-control">
 							<label>Select which boards you want to see</label>
 							<div class="tip">All boards are selectd by default</div>
-							<div class="github-board">
+							<div class="trello-board">
 								{{#each config.boards as |board|}}
 									{{#if board.id}}
-										<div class="github-list" {{action 'onBoardCheckbox' board.id}}>
+										<div class="trello-list" {{action 'onBoardCheckbox' board.id}}>
 											{{#if board.included}}
-												<i class="material-icons widget-checkbox checkbox-gray github-list-checkbox">check_box</i>
+												<i class="material-icons widget-checkbox checkbox-gray trello-list-checkbox">check_box</i>
 											{{else}}
-												<i class="material-icons widget-checkbox checkbox-gray github-list-checkbox">check_box_outline_blank</i>
+												<i class="material-icons widget-checkbox checkbox-gray trello-list-checkbox">check_box_outline_blank</i>
 											{{/if}}
-											<span style="background-color: {{board.prefs.backgroundColor}}">{{board.idOrganization}} / {{board.name}}</span>
+											<span class="trello-label" style="background-color: {{board.prefs.backgroundColor}}">{{board.orgName}} / {{board.name}}</span>
 										</div>
 									{{/if}}
 								{{/each}}
@@ -41,7 +43,10 @@
 					</div>
 				</div>
 			</div>
-			<div class="pull-right width-50">
+
+			<div class="pull-left width-10">&nbsp;</div>
+
+			<div class="pull-left width-45">
 				<div class="input-form">
 						<div class="input-control">
 							<label>Individual Board</label>
@@ -87,5 +92,5 @@
 		</div>
 
 	{{/if}}
-
+</div>
 {{/section/base-editor}}
diff --git a/core/section/trello/archive_template.go b/core/section/trello/archive_template.go
index bab5179f..7bcd4a03 100644
--- a/core/section/trello/archive_template.go
+++ b/core/section/trello/archive_template.go
@@ -12,49 +12,51 @@
 package trello
 
 const archiveTemplate = `
-<div class="section-trello-render">
-
-{{if gt (len .Boards) 0}}
-	<div class="heading">Deleted and Archived Cards</div>
-	<p>Changes since {{.Since}}.</p>
+{{if false}}
 	<div class="section-trello-render">
-		<table class="trello-table" class="width-100">
-			<tbody class="trello">
-			{{range $b := .Boards}}
-				<tr>
-					<td>
-						<a href="{{ $b.Board.URL }}">
-							<span class="trello-board" style="background-color: {{$b.Board.Prefs.BackgroundColor}}">{{$b.Board.Name}}</span>
-						</a>
-					</td>
-					<td>
-						{{range $act := $b.Actions}}
-							{{if eq $act.Type "deleteCard" }}
-								Deleted:
-									{{$act.Data.List.Name}}
-									{{if ne $act.Data.Card.Name ""}}
-										: {{$act.Data.Card.Name}}
-										{{if ne $act.Data.Text ""}}
-											- {{$act.Data.Text}}
+
+	{{if gt (len .Boards) 0}}
+		<div class="heading">Deleted and Archived Cards</div>
+		<p>Changes since {{.Since}}.</p>
+		<div class="section-trello-render">
+			<table class="trello-table" class="width-100">
+				<tbody class="trello">
+				{{range $b := .Boards}}
+					<tr>
+						<td>
+							<a href="{{ $b.Board.URL }}">
+								<span class="trello-board" style="background-color: {{$b.Board.Prefs.BackgroundColor}}">{{$b.Board.Name}}</span>
+							</a>
+						</td>
+						<td>
+							{{range $act := $b.Actions}}
+								{{if eq $act.Type "deleteCard" }}
+									Deleted:
+										{{$act.Data.List.Name}}
+										{{if ne $act.Data.Card.Name ""}}
+											: {{$act.Data.Card.Name}}
+											{{if ne $act.Data.Text ""}}
+												- {{$act.Data.Text}}
+											{{end}}
 										{{end}}
+									<br>
+								{{end}}
+							{{end}}
+							{{range $arch := $b.Archived}}
+								Archived:
+									{{$arch.Name}}
+									{{if ne $arch.Desc ""}}
+										- {{$arch.Desc}}
 									{{end}}
 								<br>
 							{{end}}
-						{{end}}
-						{{range $arch := $b.Archived}}
-							Archived:
-								{{$arch.Name}}
-								{{if ne $arch.Desc ""}}
-									- {{$arch.Desc}}
-								{{end}}
-							<br>
-						{{end}}
-					</td>
-				</tr>
-			{{end}}
-			</tbody>
-		</table>
+						</td>
+					</tr>
+				{{end}}
+				</tbody>
+			</table>
+		</div>
+	{{end}}
 	</div>
 {{end}}
-</div>
 `