diff --git a/css/style.css b/css/style.css
index 190317bfe..7141a070c 100644
--- a/css/style.css
+++ b/css/style.css
@@ -458,12 +458,15 @@ button.button-inline:hover {
 	min-height: initial;
 }
 
+.card-controls .icon-filetype-text {
+	margin-right: 5px;
+}
+
 .due {
 	padding: 1px 3px;
 	border-radius: 4px;
-	margin-right: 2px;
+	margin-right: 4px;
 	font-size: 90%;
-	margin-left: 5px;
 	opacity: .7;
 }
 .due .icon {
diff --git a/js/controller/CardController.js b/js/controller/CardController.js
index 6146e4d6c..e161ce2f3 100644
--- a/js/controller/CardController.js
+++ b/js/controller/CardController.js
@@ -20,6 +20,9 @@
  *  
  */
 
+/* global app */
+/* global moment */
+
 app.controller('CardController', function ($scope, $rootScope, $routeParams, $location, $stateParams, BoardService, CardService, StackService, StatusService) {
 	$scope.sidebar = $rootScope.sidebar;
 	$scope.status = {};
diff --git a/js/directive/datepicker.js b/js/directive/datepicker.js
index 5fde0da7c..d7024b0a5 100644
--- a/js/directive/datepicker.js
+++ b/js/directive/datepicker.js
@@ -20,12 +20,16 @@
  *
  */
 
+/* global app */
+/* gloabl t */
+/* global moment */
+
 app.directive('datepicker', function () {
 	'use strict';
 	return {
 		link: function (scope, elm, attr) {
 			return elm.datepicker({
-				dateFormat: "yy-mm-dd",
+				dateFormat: 'yy-mm-dd',
 				onSelect: function(date, inst) {
 					scope.setDuedate(moment(date));
 					scope.$apply();
@@ -37,7 +41,7 @@ app.directive('datepicker', function () {
 					dp.css({
 						'margin-left': marginLeft
 					});
-					$("div.ui-datepicker:before").css({
+					$('div.ui-datepicker:before').css({
 						'left': 100 + 'px'
 					});
 					return $('.hasDatepicker').datepicker();
@@ -45,6 +49,5 @@ app.directive('datepicker', function () {
 				minDate: null
 			});
 		}
-
-	}
+	};
 });
\ No newline at end of file
diff --git a/js/directive/timepicker.js b/js/directive/timepicker.js
index cdbe9662a..4852a19a5 100644
--- a/js/directive/timepicker.js
+++ b/js/directive/timepicker.js
@@ -20,6 +20,10 @@
  *
  */
 
+/* global app */
+/* global t */
+/* global moment */
+
 app.directive('timepicker', function() {
 	'use strict';
 	return {
@@ -27,7 +31,7 @@ app.directive('timepicker', function() {
 		link: function(scope, elm, attr) {
 			return elm.timepicker({
 				onSelect: function(date, inst) {
-					scope.setDuedateTime(moment("2000-01-01 " + date));
+					scope.setDuedateTime(moment('2000-01-01 ' + date));
 					scope.$apply();
 				},
 				myPosition: 'center top',
diff --git a/js/filters/dateFilters.js b/js/filters/dateFilters.js
index 0c8d3e3ce..c9c7ca9f0 100644
--- a/js/filters/dateFilters.js
+++ b/js/filters/dateFilters.js
@@ -20,6 +20,10 @@
  *  
  */
 
+/* global app */
+/* global OC */
+/* global moment */
+
 app.filter('relativeDateFilter', function() {
 	return function (timestamp) {
 		return OC.Util.relativeModifiedDate(timestamp*1000);
@@ -43,7 +47,7 @@ app.filter('parseDate', function() {
 		if(moment(date).isValid()) {
 			return moment(date).format('YYYY-MM-DD');
 		}
-		return "";
+		return '';
 	}
 });
 
@@ -52,6 +56,6 @@ app.filter('parseTime', function() {
 		if(moment(date).isValid()) {
 			return moment(date).format('HH:mm');
 		}
-		return "";
+		return '';
 	}
 });
\ No newline at end of file
diff --git a/templates/part.board.mainView.php b/templates/part.board.mainView.php
index bc32f1b43..48850da6e 100644
--- a/templates/part.board.mainView.php
+++ b/templates/part.board.mainView.php
@@ -68,9 +68,10 @@
 						
 						<div class="card-controls">
 							<i class="icon icon-filetype-text" ng-if="c.description" title="{{ c.description }}"></i>
-							<span class="live-relative-timestamp due" ng-if="c.duedate"
-								  ng-class="{'overdue': c.overdue == 3, 'now': c.overdue == 2, 'next': c.overdue == 1  }"
-								  data-timestamp="{{ c.duedate | dateToTimestamp }}"><i class="icon icon-calendar"></i>{{ c.duedate | relativeDateFilterString }}</span>
+							<span class="due" ng-if="c.duedate" ng-class="{'overdue': c.overdue == 3, 'now': c.overdue == 2, 'next': c.overdue == 1  }">
+								<i class="icon icon-calendar"></i>
+								<span data-timestamp="{{ c.duedate | dateToTimestamp }}" class="live-relative-timestamp">{{ c.duedate | relativeDateFilterString }}</span>
+							</span>
 							<div class="app-popover-menu-utils" ng-if="!boardservice.isArchived()">
 								<button class="button-inline card-options icon-more" ng-model="card"></button>
 								<div class="popovermenu hidden">