diff --git a/cdm.css b/cdm.css
index 0b4e2f01c..0e9b0468e 100644
--- a/cdm.css
+++ b/cdm.css
@@ -3,9 +3,22 @@ div.cdmHeader img, div.cdmHeader input, div.cdmFooter img {
 }
 
 div.cdmHeader {
+	display : table;
+}
+
+div.cdmHeader > * {
+	display : table-cell;
 	padding : 5px;
 }
 
+div.cdmHeader > div {
+	white-space : nowrap;
+}
+
+div.cdmHeader > span {
+	width : 100%;
+}
+
 div.cdmHeader span.updated {
 	color : gray;
 	font-weight : normal;
diff --git a/functions.php b/functions.php
index 4c4f76876..3e591ea41 100644
--- a/functions.php
+++ b/functions.php
@@ -5379,18 +5379,7 @@
 
 					$reply['content'] .= "<div class=\"cdmHeader\">";
 
-					$reply['content'] .= "<div style='float : right'>";
-					$reply['content'] .= "<span class='updated'>$updated_fmt</span>";
-					$reply['content'] .= "$score_pic";
-
-					if (!get_pref($link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
-						$reply['content'] .= "<span style=\"cursor : pointer\"
-							title=\"".htmlspecialchars($line["feed_title"])."\"
-							onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
-					}
-					$reply['content'] .= "<div class=\"updPic\">$update_pic</div>";
-
-					$reply['content'] .= "</div>";
+					$reply['content'] .= "<div>";
 
 					$reply['content'] .= "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
 							'RROW-$id')\" id=\"RCHK-$id\"/>";
@@ -5398,6 +5387,8 @@
 					$reply['content'] .= "$marked_pic";
 					$reply['content'] .= "$published_pic";
 
+					$reply['content'] .= "</div>";
+
 					$reply['content'] .= "<span id=\"RTITLE-$id\"
 						onclick=\"return cdmClicked(event, $id);\"
 						class=\"titleWrap$hlc_suffix\">
@@ -5430,6 +5421,18 @@
 
 					$reply['content'] .= "</span>";
 
+					$reply['content'] .= "<div>";
+					$reply['content'] .= "<span class='updated'>$updated_fmt</span>";
+					$reply['content'] .= "$score_pic";
+
+					if (!get_pref($link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
+						$reply['content'] .= "<span style=\"cursor : pointer\"
+							title=\"".htmlspecialchars($line["feed_title"])."\"
+							onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
+					}
+					$reply['content'] .= "<div class=\"updPic\">$update_pic</div>";
+					$reply['content'] .= "</div>";
+
 					$reply['content'] .= "</div>";
 
 					$reply['content'] .= "<div class=\"cdmContent\" $content_hidden