diff --git a/css/master.css b/css/master.css
index 41b66b5..8423120 100644
--- a/css/master.css
+++ b/css/master.css
@@ -1,5 +1,5 @@
 /** Basic elements */
-body {
+body, input, textarea {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 12pt;
 }
@@ -40,6 +40,10 @@ body {
   margin-top: 20px;
 }

+.clear {
+  clear: both;
+}
+
 /** Main bug list */
 #bug-list {
   width: 100%;
@@ -67,8 +71,51 @@ body {
 }

 /** Bug display */
+#bug-content {
+  background: -webkit-gradient(
+    linear,
+    left bottom,
+    left top,
+    color-stop(0, rgb(255,255,255)),
+    color-stop(1, rgb(220,231,250))
+  );
+  background: ;-moz-linear-gradient(
+    center bottom,
+    rgb(255,255,255) 0%,
+    rgb(220,231,250) 100%
+  );
+}
+
+#bug-title input {
+  width: 70%;
+}
+
+#bug-comments {
+  width: 70%;
+  background-color: white;
+}
+
+#metadata {
+  width: 30%;
+  float: right;
+}
+
 #attributes dt {
   float: left;
+  width: 40%;
+  font-weight: bold;
+  clear: both;
+}
+
+#attributes input {
+  width: 90%;
+}
+
+#attributes dd {
+/*  width: 20%;*/
+/*  display: inline-block;*/
+  float: right;
+  width: 48%;
 }

 /** System Options */
@@ -106,10 +153,6 @@ body {
   padding: 3px;
 }

-#settings td input {
-  font-size: 12pt;
-}
-
 #settings td input[type="text"] {
   width: 80%;
 }
diff --git a/templates/bug_view.tpl b/templates/bug_view.tpl
index bc59f24..6a80cb5 100644
--- a/templates/bug_view.tpl
+++ b/templates/bug_view.tpl
@@ -2,9 +2,12 @@
   $title = ($this->action == 'insert') ?
       l10n::S('BUG_NEW_TITLE') :
       l10n::F('BUG_EDIT_TITLE', $this->bug->bug_id, Cleaner::HTML($this->bug->title));
-  InsertView('header', array('title' => $title))
+  InsertView('header', array('title' => $title, 'disable_wrapper' => TRUE));
 ?>

+<!-- bug-content -->
+<div id="bug-content">
+
 <script type="text/javascript" src="<?= WebRoot('js/attributes.js') ?>"></script>

 <form action="<?= EventLink('BugEdit') ?>" method="post">
@@ -13,32 +16,42 @@
 <? endif ?>
 <input type="hidden" name="action" value="$[action]" id="action">

-<h1>Bug #$[bug.bug_id]: <input type="text" name="title" value="$[bug.title]" id="title"></h1>
+<h1 id="bug-title">
+  <input type="text" name="title" value="$[bug.title]" id="title">
+</h1>

-<dl id="attributes">
-  <dt>Reporter:</dt>
-  <dd>$[bug_reporter.alias]</dd>
+<div id="metadata">
+  <dl id="attributes">
+    <? if ($this->bug->bug_id): ?>
+      <dt>Bug ID:</dt>
+      <dd>$[bug.bug_id]</dd>
+    <? endif ?>
+    <dt>Reporter:</dt>
+    <dd>$[bug_reporter.alias]</dd>

-  <dt>Date:</dt>
-  <dd><?= gmdate('r', $this->bug->reporting_date + (Bugdar::$auth->current_user()->timezone * 3600)) ?></dd>
-</dl>
+    <dt>Date:</dt>
+    <dd><?= gmdate('r', $this->bug->reporting_date + (Bugdar::$auth->current_user()->timezone * 3600)) ?></dd>
+  </dl>

-<div><a href="javascript:AddAttribute()">Add Attribute</a></div>
+  <div class="clear"></div>

-<? if ($this->action != 'insert'): ?>
-  <h2>Comments</h2>
-  <? foreach ($this->comments as $comment): ?>
-  <div>
-    <strong>Posted by <a href="<?= EventLink('UserView', $comment->post_alias) ?>"><?= Cleaner::HTML($comment->post_alias) ?></a> on <?= gmdate('r', $comment->post_date + (Bugdar::$auth->current_user()->timezone * 3600)) ?></strong>
-    <p><?= Cleaner::HTML($comment->body) ?></p>
-  </div>
-  <? endforeach ?>
-<? endif ?>
+  <div><a href="javascript:AddAttribute()">Add Attribute</a></div>
+  <div><input type="submit" name="submit" value="Save Changes" id="submit" /></div>
+</div>

-<h1><?= ($this->action == 'update' ? 'Add Comment' : 'Description') ?></h1>
-<textarea name="comment_body" rows="8" cols="40"></textarea>
+<div id="bug-comments">
+  <? if ($this->action != 'insert'): ?>
+    <? foreach ($this->comments as $comment): ?>
+    <div>
+      <strong>Posted by <a href="<?= EventLink('UserView', $comment->post_alias) ?>"><?= Cleaner::HTML($comment->post_alias) ?></a> on <?= gmdate('r', $comment->post_date + (Bugdar::$auth->current_user()->timezone * 3600)) ?></strong>
+      <p><?= Cleaner::HTML($comment->body) ?></p>
+    </div>
+    <? endforeach ?>
+  <? endif ?>

-<div><input type="submit" name="submit" value="Save Changes" id="submit" /></div>
+  <h1><?= ($this->action == 'update' ? 'Add Comment' : 'Description') ?></h1>
+  <textarea name="comment_body" rows="8" cols="40"></textarea>
+</div>

 </form>

@@ -49,4 +62,7 @@
   AddAttribute();
 </script>

+</div>
+<!-- / bug-content -->
+
 <?= InsertView('footer') ?>
\ No newline at end of file
diff --git a/templates/header.tpl b/templates/header.tpl
index 3954d62..83e816c 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -32,4 +32,4 @@ title - Used as the title of the web page.
 </div>

 <!-- wrapper -->
-<div id="wrapper">
+<div id="<?= ($this->disable_wrapper) ? 'no-wrapper' : 'wrapper' ?>">