diff --git a/app/lang/en/cachet.php b/app/lang/en/cachet.php
index 56d45556..041f359a 100644
--- a/app/lang/en/cachet.php
+++ b/app/lang/en/cachet.php
@@ -28,6 +28,7 @@ return array(
     'powered_by' => ':app Status Page is powered by <a href="https://cachethq.github.io">Cachet</a>.',
     'logout' => 'Logout',
     'dashboard_link' => 'You\'re logged in.',
+    'setup' => 'Setup Cachet',
     'dashboard' => array(
         'dashboard' => 'Dashboard',
         'components' => 'Components',
diff --git a/app/views/setup.blade.php b/app/views/setup.blade.php
index d60574a4..e5a0e7ab 100644
--- a/app/views/setup.blade.php
+++ b/app/views/setup.blade.php
@@ -1,14 +1,11 @@
-@extends('layout.master')
+@extends('layout.dashboard')
 
 @section('content')
-    <div class='text-header'>
-        <h1>Setup Cachet <small>Under construction.</small></h1>
+    <div class='header'>
+        <i class='fa fa-cog'></i> {{ Lang::get('cachet.setup') }}
     </div>
-
-    <hr />
-
     <div class='row'>
-        <div class='col-md-8'>
+        <div class='col-sm-12'>
             <div class='panel panel-default'>
                 <div class='panel-heading'>Service Details</div>
                 <div class='panel-body'>
@@ -70,15 +67,6 @@
                 </div>
             </div>
         </div>
-        <div class='col-md-4'>
-            <div class='panel panel-info'>
-                <div class='panel-heading'>Ding!</div>
-                <div class='panel-body'>
-                    <p>You'll be able to reconfigure Cachet later on.</p>
-                    <p>At least when there is a management panel&hellip;</p>
-                </div>
-            </div>
-        </div>
     </div>
 
 @stop