diff --git a/templates/chats.tpl b/templates/chats.tpl
index 3fab077..1925754 100644
--- a/templates/chats.tpl
+++ b/templates/chats.tpl
@@ -20,10 +20,10 @@
 		</div>
 		<!-- ENDIF !allowed -->
 		<!-- IF meta -->
-		<div class="expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
+		<div component="chat/messages" class="expanded-chat" data-uid="{meta.uid}" data-username="{meta.username}">
 
 			<button type="button" class="close" data-action="pop-out"><span aria-hidden="true"><i class="fa fa-compress"></i></span><span class="sr-only">[[modules:chat.pop-out]]</span></button>
-			<h1>{meta.username}</h1>
+			<h1 component="chat/title">{meta.username}</h1>
 
 
 			<span class="since-bar"><a href="#" class="selected" data-since="recent">[[recent:title]]</a> &bull; <a href="#" data-since="week">[[modules:chat.seven_days]]</a> &bull; <a href="#" data-since="month">[[modules:chat.thirty_days]]</a> &bull; <a href="#" data-since="threemonths">[[modules:chat.three_months]]</a></span>
@@ -31,7 +31,7 @@
 				<!-- IMPORT partials/chat_messages.tpl -->
 			</ul>
 			<div class="input-group">
-				<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input" rows="1"></textarea>
+				<textarea component="chat/input" placeholder="[[modules:chat.placeholder]]" class="form-control chat-input mousetrap" rows="1"></textarea>
 				<span class="input-group-btn">
 					<button class="btn btn-primary" type="button" data-action="send">[[modules:chat.send]]</button>
 				</span>
diff --git a/templates/partials/breadcrumbs.tpl b/templates/partials/breadcrumbs.tpl
index 6118e3e..8ad352c 100644
--- a/templates/partials/breadcrumbs.tpl
+++ b/templates/partials/breadcrumbs.tpl
@@ -1,7 +1,7 @@
 <!-- IF breadcrumbs.length -->
 <ol class="breadcrumb">
 	<!-- BEGIN breadcrumbs -->
-	<li itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb" <!-- IF @last -->class="active"<!-- ENDIF @last -->>
+	<li<!-- IF @last --> component="breadcrumb/current"<!-- ENDIF @last --> itemscope="itemscope" itemtype="http://data-vocabulary.org/Breadcrumb" <!-- IF @last -->class="active"<!-- ENDIF @last -->>
 		<!-- IF !@last --><a href="{breadcrumbs.url}" itemprop="url"><!-- ENDIF !@last -->
 			<span itemprop="title">
 				{breadcrumbs.text}