diff --git a/test/input-textarea.html b/test/input-textarea.html
index c6d0adc20a..b775ed7e89 100644
--- a/test/input-textarea.html
+++ b/test/input-textarea.html
@@ -1,122 +1,247 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>Text Area</title>
+    <title>Textarea</title>
 
     <!-- Sets initial viewport load and disables zooming  -->
     <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link href="../dist/ionicons.css" rel="stylesheet">
-    <link href="../dist/ionic.css" rel="stylesheet">
+    <link href="../dist/css/ionic.css" rel="stylesheet">
   </head>
   <body>
 
-    <section class="view">
+    <header class="bar bar-header bar-dark">
+      <h1 class="title">Textarea</h1>
+    </header>
 
-      <header class="bar bar-header bar-dark">
-        <h1 class="title">Text Area</h1>
-      </header>
+    <div class="content has-header">
 
-      <header class="bar bar-footer bar-dark">
-        <h1 class="title">Footer</h1>
-      </header>
+      <h3>Default Textarea, Not Inset, No Content Padding</h3>
+      <div class="list">
+        <label class="item item-input">
+          <textarea placeholder="First Name"></textarea>
+        </label>
+        <label class="item item-input">
+          <textarea placeholder="Last Name"></textarea>
+        </label>
+      </div>
 
-      <div class="content has-header has-footer">
+      <h3>Default Textarea, list-inset, No Content Padding</h3>
+      <div class="list list-inset">
+        <label class="item item-input">
+          <textarea placeholder="First Name"></textarea>
+        </label>
+        <label class="item item-input">
+          <textarea placeholder="Last Name"></textarea>
+        </label>
+      </div>
 
-        <h3>Default Text Area, Not Inset, No Content Padding</h3>
-        <div class="input-group">
-          <label class="input-wrapper">
-            <textarea rows="5" placeholder="5 Rows"></textarea>
+      <h3>Default Textarea, card, No Content Padding</h3>
+      <div class="list card">
+        <label class="item item-input">
+          <textarea placeholder="First Name"></textarea>
+        </label>
+        <label class="item item-input">
+          <textarea placeholder="Last Name"></textarea>
+        </label>
+      </div>
+
+      <div class="padding">
+
+        <h3>Default Textarea, With Parent Content Padding</h3>
+        <div class="list">
+          <label class="item item-input">
+            <textarea placeholder="Username"></textarea>
           </label>
         </div>
 
-        <h3>Default Text Area, Is Inset, No Content Padding</h3>
-        <div class="input-group margin">
-          <label class="input-wrapper">
-            <textarea rows="3" placeholder="Summary"></textarea>
-          </label>
-          <label class="input-wrapper">
-            <textarea rows="5" placeholder="Description"></textarea>
+        <div class="list">
+          <label class="item item-input">
+            <textarea placeholder="Filter by name"></textarea>
           </label>
         </div>
 
-        <div class="padding">
-
-          <h3>Default Text Area, Not Inset, With Content Padding</h3>
-          <div class="input-group">
-            <label class="input-wrapper">
-              <textarea placeholder="No rows set"></textarea>
-            </label>
-            <label class="input-wrapper">
-              <textarea rows="4" placeholder="4 rows"></textarea>
-            </label>
-          </div>
-
-          <div class="input-group">
-            <label class="input-wrapper">
-              <textarea rows="5" placeholder="Description"></textarea>
-            </label>
-          </div>
-
-          <h3>Default Text Area, Is Inset, With Content Padding</h3>
-          <div class="input-group margin">
-            <label class="input-wrapper">
-              <textarea rows="3" placeholder="3 Rows"></textarea>
-            </label>
-          </div>
-
-        </div>
-
-
-        <h3>Stacked Label On Top Of Text Area, Not Inset, No Content Padding</h3>
-        <div class="input-group stacked-label">
-          <label class="input-wrapper">
-            <span class="input-label">Summary</span>
-            <textarea rows="3" placeholder="3 Rows"></textarea>
+        <h3>Default Textarea, list-inset, With Parent Content Padding</h3>
+        <div class="list list-inset">
+          <label class="item item-input">
+            <textarea placeholder="Email"></textarea>
           </label>
-          <label class="input-wrapper">
-            <span class="input-label">Description</span>
-            <textarea rows="6" placeholder="6 Rows"></textarea>
+          <label class="item item-input">
+            <textarea placeholder="Name"></textarea>
           </label>
         </div>
 
-        <h3>Stacked Label On Top Of Text Area, Is Inset, No Content Padding</h3>
-        <div class="input-group stacked-label margin">
-          <label class="input-wrapper">
-            <span class="input-label">Summary</span>
-            <textarea rows="3" placeholder="3 Rows"></textarea>
-          </label>
-        </div>
-
-        <div class="padded">
-
-          <h3>Stacked Label On Top Of Text Area, Not Inset, With Content Padding</h3>
-          <div class="input-group stacked-label">
-            <label class="input-wrapper">
-              <span class="input-label">Summary</span>
-              <textarea rows="3" placeholder="3 Rows"></textarea>
-            </label>
-          </div>
-
-          <h3>Stacked Label On Top Of Text Area, Is Inset, With Content Padding</h3>
-          <div class="input-group stacked-label margin">
-            <label class="input-wrapper">
-              <span class="input-label">Summary</span>
-              <textarea rows="3" placeholder="3 Rows"></textarea>
-            </label>
-          </div>
-
-        </div>
-
-
-
-        <p><a class="button button-secondary" href="index.html">Homepage</a></p>
-
       </div>
 
-    </section>
-    
-    <script src="../dist/ionic.js"></script>
-    <script src="../dist/ionic-simple.js"></script>
+
+      <h3>Label left of input, No Parent Content Padding</h3>
+      <div class="list">
+        <label class="item item-input">
+          <span class="input-label">Username</span>
+          <textarea placeholder="@drifty"></textarea>
+        </label>
+        <label class="item item-input">
+          <span class="input-label">First Name</span>
+          <textarea placeholder="Sir Derp"></textarea>
+        </label>
+      </div>
+
+
+      <h3>Label left of input, No Parent Content Padding</h3>
+      <div class="list">
+        <label class="item item-input">
+          <i class="icon ion-person"></i>
+          <span class="input-label">Username</span>
+          <textarea placeholder="@drifty"></textarea>
+        </label>
+        <label class="item item-input">
+          <i class="icon ion-email"></i>
+          <span class="input-label">Email</span>
+          <input type="email" placeholder="your@email.com">
+        </label>
+      </div>
+
+      <h3>Inline Label On Top Of Textarea, list-inset, No Parent Content Padding</h3>
+      <div class="list list-inset">
+        <label class="item item-input">
+          <span class="input-label">Email</span>
+          <textarea placeholder="your@email.com"></textarea>
+        </label>
+      </div>
+
+      <div class="padding">
+
+        <h3>Inline Label On Top Of Textarea, With Parent Content Padding</h3>
+        <div class="list">
+          <label class="item item-input">
+            <span class="input-label">First Name</span>
+            <textarea placeholder="John"></textarea>
+          </label>
+          <label class="item item-input">
+            <span class="input-label">Last Name</span>
+            <textarea placeholder="Suhr"></textarea>
+          </label>
+        </div>
+
+        <h3>Inline Label On Top Of Textarea, list-inset, With Parent Content Padding</h3>
+        <div class="list list-inset">
+          <label class="item item-input">
+            <span class="input-label">Email</span>
+            <textarea placeholder="your@email.com"></textarea>
+          </label>
+        </div>
+        <div class="list list-inset">
+          <label class="item item-input">
+            <span class="input-label">Filter By Name</span>
+            <textarea placeholder="Enter keywords"></textarea>
+          </label>
+        </div>
+
+      </div>
+
+
+
+
+      <h3>Stacked Label On Top Of Textarea, No Parent Content Padding</h3>
+      <div class="list">
+        <label class="item item-input item-stacked-label">
+          <span class="input-label">First Name</span>
+          <textarea placeholder="Drifty"></textarea>
+        </label>
+        <label class="item item-input item-stacked-label">
+          <span class="input-label">Last Name</span>
+          <textarea placeholder="Co"></textarea>
+        </label>
+        <label class="item item-input item-stacked-label">
+          <span class="input-label">Email</span>
+          <textarea placeholder="your@email.com"></textarea>
+        </label>
+      </div>
+      <div class="list">
+        <label class="item item-input item-stacked-label">
+          <span class="input-label">Filter By Name</span>
+          <textarea placeholder=""></textarea>
+        </label>
+      </div>
+
+      <h3>Stacked Label On Top Of Textarea, list-inset, No Parent Content Padding</h3>
+      <div class="list list-inset">
+        <label class="item item-input item-stacked-label">
+          <span class="input-label">Email</span>
+          <textarea placeholder="your@email.com"></textarea>
+        </label>
+      </div>
+
+      <div class="padding">
+
+        <h3>Stacked Label On Top Of Textarea, With Parent Content Padding</h3>
+        <div class="list">
+          <label class="item item-input item-stacked-label">
+            <span class="input-label">Email</span>
+            <textarea placeholder="your@email.com"></textarea>
+          </label>
+        </div>
+
+        <h3>Stacked Label On Top Of Textarea, list-inset, With Parent Content Padding</h3>
+        <div class="list list-inset">
+          <label class="item item-input item-stacked-label">
+            <span class="input-label">Email</span>
+            <textarea placeholder="your@email.com"></textarea>
+          </label>
+        </div>
+
+      </div>
+
+      <h3>Default Textarea, No Parent Content Padding</h3>
+      <div class="list">
+        <label class="item item-input">
+          <i class="icon ion-search placeholder-icon"></i>
+          <input type="search" placeholder="Search">
+        </label>
+      </div>
+
+      <h3>Default Textarea, list-inset, No Parent Content Padding</h3>
+      <div class="list list-inset">
+        <label class="item item-input">
+          <i class="icon ion-star placeholder-icon"></i>
+          <textarea placeholder="Favorites"></textarea>
+        </label>
+      </div>
+
+
+      <h3>Stacked Label On Top Of Textarea, No Parent Content Padding</h3>
+      <div class="list">
+        <label class="item item-input item-stacked-label">
+          <i class="icon ion-email"></i> 
+          <span class="input-label">Email</span>
+          <textarea placeholder="your@email.com"></textarea>
+        </label>
+      </div>
+
+      <div class="padding">
+
+        <h3>Stacked Label On Top Of Textarea, With Parent Content Padding</h3>
+        <div class="list">
+          <label class="item item-input item-stacked-label">
+            <i class="icon ion-cloud"></i> 
+            <span class="input-label">SaaS</span>
+            <textarea placeholder="Codiqa"></textarea>
+          </label>
+        </div>
+
+        <h3>Stacked Label On Top Of Textarea, list-inset, With Parent Content Padding</h3>
+        <div class="list list-inset">
+          <label class="item item-input item-stacked-label">
+            <i class="icon ion-headphone"></i> 
+            <span class="input-label">Favorite Music</span>
+            <textarea placeholder="Bee Gees"></textarea>
+          </label>
+        </div>
+
+      </div>
+
+      <p><a class="button button-secondary" href="index.html">Homepage</a></p>
+
+    </div>
 
   </body>
 </html>
