diff --git a/server/documents/collections/menu.html.eco b/server/documents/collections/menu.html.eco
index f9606306c..928f2207b 100755
--- a/server/documents/collections/menu.html.eco
+++ b/server/documents/collections/menu.html.eco
@@ -33,9 +33,6 @@ type        : 'UI Collection'
       <a class="item">
         <i class="mail icon"></i> Messages
       </a>
-      <a class="item">
-        <i class="user icon"></i> Friends
-      </a>
       <div class="right menu">
         <div class="borderless vertically fitted item">
           <div class="ui icon input">
@@ -51,6 +48,9 @@ type        : 'UI Collection'
             <a class="item">Spanish</a>
           </div>
         </div>
+        <div class="item">
+            <div class="ui teal button">Sign Up</div>
+        </div>
       </div>
     </div>
   </div>
@@ -186,7 +186,7 @@ type        : 'UI Collection'
         <i class="mail icon"></i> Messages
       </a>
       <div class="ui dropdown item">
-        More <i class="icon right triangle"></i>
+        More <i class="dropdown icon"></i>
         <div class="menu">
           <a class="item"><i class="edit icon"></i> Edit Profile</a>
           <a class="item"><i class="globe icon"></i> Choose Language</a>
@@ -238,7 +238,7 @@ type        : 'UI Collection'
         <i class="user icon"></i> Friends
       </a>
       <div class="ui dropdown item">
-        More <i class="icon right triangle"></i>
+        More <i class="dropdown icon"></i>
         <div class="menu">
           <a class="item"><i class="edit icon"></i> Edit Profile</a>
           <a class="item"><i class="globe icon"></i> Choose Language</a>
@@ -434,6 +434,35 @@ type        : 'UI Collection'
     </div>
   </div>
 
+  <div class="example">
+    <h4 class="ui header">Input</h4>
+    <p>A menu item can contain an <a href="/elements/input.html">input</a> inside of it</p>
+
+    <div class="ui menu">
+      <div class="item">
+        <div class="ui icon input">
+          <input type="text" placeholder="Search...">
+          <i class="search icon"></i>
+        </div>
+      </div>
+    </div>
+  </div>
+
+
+  <div class="example">
+    <h4 class="ui header">Button</h4>
+    <p>A menu item can contain a <a href="/elements/button.html">button</a> inside of it</p>
+
+    <div class="ui menu">
+      <div class="item">
+        <div class="ui teal button">Sign up</div>
+      </div>
+      <div class="item">
+        <div class="ui button">Log-in</div>
+      </div>
+    </div>
+  </div>
+
 
   <div class="example">
     <h4 class="ui header">Link Item</h4>
@@ -460,7 +489,7 @@ type        : 'UI Collection'
     </div>
     <div class="ui vertical menu">
       <div class="ui dropdown item">
-        Categories <i class="icon right triangle"></i>
+        Categories <i class="dropdown icon"></i>
         <div class="menu">
           <a class="item">Electronics</a>
           <a class="item">Automotive</a>
@@ -810,7 +839,7 @@ type        : 'UI Collection'
         </div>
       </div>
       <div class="ui dropdown item">
-        Dropdown <i class="icon right triangle"></i>
+        Dropdown <i class="dropdown icon"></i>
         <div class="menu">
           <div class="item">Choice 1</div>
           <div class="item">Choice 2</div>
diff --git a/server/documents/views/item.html.eco b/server/documents/views/item.html.eco
index 9a13f0013..b49ec72b1 100755
--- a/server/documents/views/item.html.eco
+++ b/server/documents/views/item.html.eco
@@ -30,10 +30,10 @@ type        : 'UI View'
     <div class="ui items">
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres.jpg">
           <a class="like ui corner label">
             <i class="like icon"></i>
           </a>
-          <img src="/images/demo/highres.jpg">
         </div>
         <div class="content">
           <div class="name">Cute Dog</div>
@@ -45,10 +45,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres2.jpg">
           <a class="like ui corner label">
             <i class="like icon"></i>
           </a>
-          <img src="/images/demo/highres2.jpg">
         </div>
         <div class="content">
           <div class="meta">5 days ago</div>
@@ -61,10 +61,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres3.jpg">
           <a class="like ui corner label">
             <i class="like icon"></i>
           </a>
-          <img src="/images/demo/highres3.jpg">
         </div>
         <div class="content">
           <div class="name">Silly Dog</div>
@@ -122,10 +122,10 @@ type        : 'UI View'
     <div class="ui stackable items">
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres5.jpg">
           <a class="like ui corner label">
             <i class="like icon"></i>
           </a>
-          <img src="/images/demo/highres5.jpg">
         </div>
         <div class="content">
           <div class="name">Cute Dog</div>
@@ -137,10 +137,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres6.jpg">
           <a class="like ui corner label">
             <i class="like icon"></i>
           </a>
-          <img src="/images/demo/highres6.jpg">
         </div>
         <div class="content">
           <div class="meta">5 days ago</div>
@@ -244,10 +244,10 @@ type        : 'UI View'
     <div class="ui four items">
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres4.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres4.jpg">
         </div>
         <div class="content">
           <div class="name">Cute Dog</div>
@@ -256,10 +256,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres5.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres5.jpg">
         </div>
         <div class="content">
           <div class="name">Faithful Dog</div>
@@ -268,10 +268,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres3.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres3.jpg">
         </div>
         <div class="content">
           <div class="name">Silly Dog</div>
@@ -280,10 +280,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres2.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres2.jpg">
         </div>
         <div class="content">
           <div class="name">Happy Dog</div>
@@ -297,10 +297,10 @@ type        : 'UI View'
     <div class="ui five connected items">
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres4.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres4.jpg">
         </div>
         <div class="content">
           <div class="name">Cute Dog</div>
@@ -309,10 +309,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres5.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres5.jpg">
         </div>
         <div class="content">
           <div class="name">Faithful Dog</div>
@@ -321,10 +321,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres3.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres3.jpg">
         </div>
         <div class="content">
           <div class="name">Silly Dog</div>
@@ -333,10 +333,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres2.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres2.jpg">
         </div>
         <div class="content">
           <div class="name">Happy Dog</div>
@@ -345,10 +345,10 @@ type        : 'UI View'
       </div>
       <div class="item">
         <div class="image">
+          <img src="/images/demo/highres.jpg">
           <a class="star ui corner label">
             <i class="star icon"></i>
           </a>
-          <img src="/images/demo/highres.jpg">
         </div>
         <div class="content">
           <div class="name">Quiet Dog</div>