diff --git a/modules/distribution/src/repository/jaggeryapps/iot/units/alldevices/alldevices.hbs b/modules/distribution/src/repository/jaggeryapps/iot/units/alldevices/alldevices.hbs
index eec368e3..350a3eb6 100644
--- a/modules/distribution/src/repository/jaggeryapps/iot/units/alldevices/alldevices.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iot/units/alldevices/alldevices.hbs
@@ -20,33 +20,70 @@
                 </thead>
                 <tbody>
                 <form method="GET" action="{{myDevicePath}}">
-				{{#if devices.device}}
-				{{#each devices.device}}
-				<tr class="border-top">
-					<th scope="row">{{deviceIdentifier}}</th>
-					<td>{{name}}</td>
-					<td class="float-right border-top ">
-						<button class="btn-black-action" name="deviceId"
-								value="{{deviceIdentifier}}">
-							<i class="fw fw-view padding-right"></i>View
-						</button>
-						<button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
-							<i class="fw fw-edit padding-right"></i>Edit
-						</button>
-						<button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
-							<i class="fw fw-delete padding-right"></i>Remove
-						</button>
-					</td>
-				</tr>
-				{{/each}}
-				{{else}}
-				<tr class="border-top">
-					<th scope="row"></th>
-					<td colspan="2">
-						No Devices available.
-					</td>
-				</tr>
-				{{/if}}
+                    <tr class="border-top">
+                        <th scope="row">001</th>
+                        <td>John's Raspberry Pi</td>
+                        <td class="float-right border-top ">
+                            <button class="btn-black-action" name="deviceId"
+                                    value="{{deviceIdentifier}}">
+                                <i class="fw fw-view padding-right"></i>View
+                            </button>
+                            <button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
+                                <i class="fw fw-edit padding-right"></i>Edit
+                            </button>
+                            <button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
+                                <i class="fw fw-delete padding-right"></i>Remove
+                            </button>
+                        </td>
+                    </tr>
+                    <tr class="border-top">
+                        <th scope="row">002</th>
+                        <td>John's Arduino</td>
+                        <td class="float-right border-top ">
+                            <button class="btn-black-action" name="deviceId"
+                                    value="{{deviceIdentifier}}">
+                                <i class="fw fw-view padding-right"></i>View
+                            </button>
+                            <button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
+                                <i class="fw fw-edit padding-right"></i>Edit
+                            </button>
+                            <button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
+                                <i class="fw fw-delete padding-right"></i>Remove
+                            </button>
+                        </td>
+                    </tr>
+                    <tr class="border-top">
+                        <th scope="row">003</th>
+                        <td>John's BeagleBone</td>
+                        <td class="float-right border-top ">
+                            <button class="btn-black-action" name="deviceId"
+                                    value="{{deviceIdentifier}}">
+                                <i class="fw fw-view padding-right"></i>View
+                            </button>
+                            <button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
+                                <i class="fw fw-edit padding-right"></i>Edit
+                            </button>
+                            <button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
+                                <i class="fw fw-delete padding-right"></i>Remove
+                            </button>
+                        </td>
+                    </tr>
+                    <tr class="border-top">
+                        <th scope="row">004</th>
+                        <td>John's Firealarm</td>
+                        <td class="float-right border-top ">
+                            <button class="btn-black-action" name="deviceId"
+                                    value="{{deviceIdentifier}}">
+                                <i class="fw fw-view padding-right"></i>View
+                            </button>
+                            <button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
+                                <i class="fw fw-edit padding-right"></i>Edit
+                            </button>
+                            <button class="btn-black-action" name="deviceId" value="{{deviceIdentifier}}">
+                                <i class="fw fw-delete padding-right"></i>Remove
+                            </button>
+                        </td>
+                    </tr>
                 </form>
                 </tbody>
             </table>
diff --git a/modules/distribution/src/repository/jaggeryapps/iot/units/showcase/showcase.hbs b/modules/distribution/src/repository/jaggeryapps/iot/units/showcase/showcase.hbs
index 98cb75fe..396bf933 100644
--- a/modules/distribution/src/repository/jaggeryapps/iot/units/showcase/showcase.hbs
+++ b/modules/distribution/src/repository/jaggeryapps/iot/units/showcase/showcase.hbs
@@ -7,8 +7,7 @@
                 <div class="col-lg-8  margin-top-double">
                     <h1 class="grey">Ready to connect a device or create an app?</h1>
                     <hr>
-                    <p  class="margin-bottom-double light-grey ">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas
-                        consectetur rutrum sapien. In ullamcorper nisi nisi, et interdum libero vestibulum at. </p>
+                    <p  class="margin-bottom-double light-grey ">Connect your devices to our Device Cloud and start managing and controlling your devices. Let our products embedded into the Device Cloud analyse the data from your devices and give you all that you need to know of the devices you own.   </p>
                 </div>
             </div>
             <div class="row">
@@ -59,8 +58,8 @@
                         </div>
                         <h2 class="white center">Fire Alarm</h2>
                         <div class="text-wrapper">
-                            Lorem Ipsum is simply dummy text of the printing and typesetting
-                            industry. It been the industry's standard dummy text since the 1500s
+                            Connect your devices and start managing and controlling your devices.
+							Let us give you all that you need to know of the devices you own.
                             <br><br>
                         </div>
                         <a href="#" class="grey-btn" onclick="document.location.href='firealarm';