diff --git a/feedlist.js b/feedlist.js
index 1f4819a35..ad3c2c2c8 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -135,8 +135,6 @@ function viewfeed(feed, subop, is_cat, offset) {
 
 		console.log(query);
 
-		var container = $("headlinesInnerContainer");
-
 		var unread_ctr = -1;
 		
 		if (!is_cat) unread_ctr = getFeedUnread(feed);
diff --git a/tt-rss.css b/tt-rss.css
index 98040440d..54eefc6b6 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -4,6 +4,7 @@ body#ttrssMain, body#ttrssPrefs {
 	margin : 0px;
 	padding : 0px;
 	font-family : "Lucida Grande", Arial, sans-serif;
+	font-size : 12px;
 }
 
 body#ttrssPrefs {
@@ -596,7 +597,6 @@ div#headlines-toolbar div#subtoolbar_ftitle {
 }
 
 span.contentPreview {
-	font-size : 12px;
 	color : gray;
 	font-weight : normal;
 }
@@ -1244,16 +1244,6 @@ div#l_progress_i {
 	height : 10px;
 }
 
-/* #content-insert {
-	background-color : white;
-	overflow : auto;
-	position : absolute;
-	left : 0px;
-	right : 0px;
-	bottom : 0px;
-	top : 6px; 
-} */
-
 div.dlgSec {
 	font-size : 12px;
 	color : gray;
@@ -1508,10 +1498,6 @@ div.fatalError textarea {
 	display : none;
 }
 
-#headlinesInnerContainer {
-	font-size : 12px;
-}
-
 #content-tabs {
 	margin : 0px;
 	padding : 0px;
diff --git a/tt-rss.js b/tt-rss.js
index 69cda7e07..b9be06710 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -256,7 +256,7 @@ function init() {
 		dojo.require("dijit.form.Select");
 		dojo.require("dijit.Toolbar");
 		dojo.require("dijit.ProgressBar");
-		dojo.require("dojo.parser");
+		dojo.require("dijit.Menu");
 
 		dojo.registerModulePath("fox", "../..");
 
diff --git a/viewfeed.js b/viewfeed.js
index 37a068234..148256dda 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -98,11 +98,11 @@ function headlines_callback2(transport, feed_cur_page) {
 	
 			if (feed_cur_page == 0) {
 				if (headlines) {
-					$("headlinesInnerContainer").innerHTML = headlines_content.firstChild.nodeValue;
-					$("headlines-toolbar").innerHTML = headlines_toolbar.firstChild.nodeValue;
+					dijit.byId("headlines-frame").attr('content', 
+						headlines_content.firstChild.nodeValue);
 
-					dojo.parser.parse("headlines-toolbar");
-					//dijit.byId("main").resize();
+					dijit.byId("headlines-toolbar").attr('content',
+						headlines_toolbar.firstChild.nodeValue);
 
 					var cache_prefix = "";
 
@@ -121,19 +121,21 @@ function headlines_callback2(transport, feed_cur_page) {
 
 				} else {
 					console.warn("headlines_callback: returned no data");
-				$('headlinesInnerContainer').innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML data)') + "</div>";
+					dijit.byId("headlines-frame").attr('content', 
+						"<div class='whiteBox'>" + 
+						__('Could not update headlines (missing XML data)') + "</div>");
 	
 				}
 			} else {
 				if (headlines) {
 					if (headlines_count > 0) {
 						console.log("adding some more headlines...");
-	
-						c = $("headlinesInnerContainer");
 
+						var c = dijit.byId("headlines-frame");	
 						var ids = getSelectedArticleIds2();
 	
-						c.innerHTML = c.innerHTML + headlines_content.firstChild.nodeValue;
+						c.attr('content', c.attr('content') + 
+							headlines_content.firstChild.nodeValue);
 
 						console.log("restore selected ids: " + ids);
 
@@ -172,7 +174,8 @@ function headlines_callback2(transport, feed_cur_page) {
 	
 		} else {
 			console.warn("headlines_callback: returned no XML object");
-			$('headlinesInnerContainer').innerHTML = "<div class='whiteBox'>" + __('Could not update headlines (missing XML object)') + "</div>";
+			dijit.byId("headlines-frame").attr('content', "<div class='whiteBox'>" + 
+					__('Could not update headlines (missing XML object)') + "</div>");
 		}
 	
 
@@ -866,7 +869,7 @@ function getSelectedArticleIds2() {
 
 	var rv = [];
 
-	$$("#headlinesInnerContainer > div[id*=RROW][class*=Selected]").each(
+	$$("#headlines-frame > div[id*=RROW][class*=Selected]").each(
 		function(child) {
 			rv.push(child.id.replace("RROW-", ""));
 		});
@@ -877,7 +880,7 @@ function getSelectedArticleIds2() {
 function getLoadedArticleIds() {
 	var rv = [];
 
-	var children = $$("#headlinesInnerContainer > div[id*=RROW-]");
+	var children = $$("#headlines-frame > div[id*=RROW-]");
 
 	children.each(function(child) {
 			rv.push(child.id.replace("RROW-", ""));
@@ -891,7 +894,7 @@ function getLoadedArticleIds() {
 function selectArticles(mode) {
 	try {
 
-		var children = $$("#headlinesInnerContainer > div[id*=RROW]");
+		var children = $$("#headlines-frame > div[id*=RROW]");
 
 		children.each(function(child) {
 			var id = child.id.replace("RROW-", "");
@@ -1164,7 +1167,7 @@ function cdmWatchdog() {
 
 	try {
 
-		var ctr = $("headlinesInnerContainer");
+		var ctr = $("headlines-frame");
 
 		if (!ctr) return;
 
@@ -1775,7 +1778,7 @@ function scrollArticle(offset) {
 				ci.scrollTop += offset;
 			}
 		} else {
-			var hi = $("headlinesInnerContainer");
+			var hi = $("headlines-frame");
 			if (hi) {
 				hi.scrollTop += offset;
 			}