diff --git a/ionic/components/app/test/barkpark/main.js b/ionic/components/app/test/barkpark/main.js
index 80b29878f3..3bd4fd53a5 100644
--- a/ionic/components/app/test/barkpark/main.js
+++ b/ionic/components/app/test/barkpark/main.js
@@ -2,14 +2,15 @@
 import {For, Component, View, Parent, bootstrap} from 'angular2/angular2'
 import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms';
 import {Log} from 'ionic/util'
-import {Router, List, Item, Nav ,NavController, Button, Input, Tabs, Tab, Content, Aside} from 'ionic/ionic'
+import {Router, List, Item, Nav, NavController, Toolbar, ToolbarTitle,
+  Button, Input, Tabs, Tab, Content, Aside} from 'ionic/ionic'
 
 @Component({
   selector: 'login-page'
 })
 @View({
   templateUrl: 'pages/login.html',
-  directives: [FormDirectives, Button, Input]
+  directives: [FormDirectives, Button, Input, Content, Toolbar, ToolbarTitle]
 })
 export class LoginPage {
   constructor( @Parent() viewport: NavController ) { //, fb: FormBuilder ) {
diff --git a/ionic/components/app/test/barkpark/pages/login.html b/ionic/components/app/test/barkpark/pages/login.html
index 039155336f..a3ff8de4f5 100644
--- a/ionic/components/app/test/barkpark/pages/login.html
+++ b/ionic/components/app/test/barkpark/pages/login.html
@@ -1,4 +1,9 @@
-<div>
+<header *ion-toolbar>
+  <h1 class="toolbar-title">
+    Login
+  </h1>
+</header>
+<ion-content class="padding">
   <form (^submit)="doLogin($event)" [control-group]="loginForm">
     <ion-input>
       <input control="email" type="email" placeholder="Your email">
@@ -11,4 +16,4 @@
       <button ion-button primary block (click)="doSignup()">Create an account</button>
     </div>
   </form>
-</div>
+</ion-content>
diff --git a/ionic/config/component.js b/ionic/config/component.js
index 13184a3468..da79cbf071 100644
--- a/ionic/config/component.js
+++ b/ionic/config/component.js
@@ -59,12 +59,15 @@ export class IonicComponent {
       }
     }
 
+    // TODO: This worked fine for property-only buttons, but breaks with
+    // class, etc.
+    //
     // If we want to enhance a raw element (for example, a button),
     // only do it if we also have a matching prop class
-    if(!foundMatchingPropClass && this.enhanceRawElement) {
+    //if(!foundMatchingPropClass && this.enhanceRawElement) {
       // Don't enhace this raw element
-      return;
-    }
+      //return;
+    //}
 
     // Add the base element classes (ex, button and button-ios)
     dom.addClasses(instance.domElement, this.componentCssName, `${this.componentCssName}-${platformMode}`);