diff --git a/public/cfp.html b/public/cfp.html
index a979dd0..f97ae29 100644
--- a/public/cfp.html
+++ b/public/cfp.html
@@ -4,6 +4,9 @@
   <meta charset="UTF-8">
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
   <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3 current"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4"><a href="training">Training</a></li>
@@ -156,7 +159,7 @@ <h3 id="title153">Speaker Info</h3>
 					</div>
 					<p class="instruct" id="instruct141"><small>Links to YouTube, Confreaks, Vimeo, etc.  If we haven’t seen you speak before, this is a great way to show us what you can do.</small></p>
 				</li>
-
+				<div class="clear hr"></div>
 				<li id="foli152" class="notranslate section">
 						<section>
 							<h3 id="title152">Talk Info</h3>
diff --git a/public/contact.html b/public/contact.html
index 4d4262b..395aaaa 100644
--- a/public/contact.html
+++ b/public/contact.html
@@ -4,6 +4,9 @@
   <meta charset="UTF-8">
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
   <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4"><a href="training">Training</a></li>
diff --git a/public/images/logo.png b/public/images/aloharuby-logo.png
similarity index 100%
rename from public/images/logo.png
rename to public/images/aloharuby-logo.png
diff --git a/public/images/arrow.png b/public/images/arrow.png
deleted file mode 100644
index 73a0cff..0000000
Binary files a/public/images/arrow.png and /dev/null differ
diff --git a/public/images/google-icon.png b/public/images/google-icon.png
deleted file mode 100644
index 6151288..0000000
Binary files a/public/images/google-icon.png and /dev/null differ
diff --git a/public/images/icon-github.png b/public/images/icon-github.png
deleted file mode 100644
index 57e813c..0000000
Binary files a/public/images/icon-github.png and /dev/null differ
diff --git a/public/images/icon-location.png b/public/images/icon-location.png
deleted file mode 100644
index 6fe923a..0000000
Binary files a/public/images/icon-location.png and /dev/null differ
diff --git a/public/images/icon-registration.png b/public/images/icon-registration.png
deleted file mode 100644
index 21633aa..0000000
Binary files a/public/images/icon-registration.png and /dev/null differ
diff --git a/public/images/icon-speakers.png b/public/images/icon-speakers.png
deleted file mode 100644
index 2582e59..0000000
Binary files a/public/images/icon-speakers.png and /dev/null differ
diff --git a/public/images/icon-sponsors.png b/public/images/icon-sponsors.png
deleted file mode 100644
index e3fbd7d..0000000
Binary files a/public/images/icon-sponsors.png and /dev/null differ
diff --git a/public/images/icon-twitter.png b/public/images/icon-twitter.png
deleted file mode 100644
index 248f8d7..0000000
Binary files a/public/images/icon-twitter.png and /dev/null differ
diff --git a/public/images/icon-world.png b/public/images/icon-world.png
deleted file mode 100644
index a9fe08a..0000000
Binary files a/public/images/icon-world.png and /dev/null differ
diff --git a/public/images/rails.png b/public/images/rails.png
deleted file mode 100644
index d5edc04..0000000
Binary files a/public/images/rails.png and /dev/null differ
diff --git a/public/images/register-button-hover.png b/public/images/register-button-hover.png
deleted file mode 100644
index 7ef0c28..0000000
Binary files a/public/images/register-button-hover.png and /dev/null differ
diff --git a/public/images/register-button.png b/public/images/register-button.png
deleted file mode 100644
index 24ee84a..0000000
Binary files a/public/images/register-button.png and /dev/null differ
diff --git a/public/images/aaron-patterson.png b/public/images/speakers/aaron-patterson.png
similarity index 100%
rename from public/images/aaron-patterson.png
rename to public/images/speakers/aaron-patterson.png
diff --git a/public/images/chad-fowler.jpg b/public/images/speakers/chad-fowler.jpg
similarity index 100%
rename from public/images/chad-fowler.jpg
rename to public/images/speakers/chad-fowler.jpg
diff --git a/public/images/chad_fowler.png b/public/images/speakers/chad_fowler.png
similarity index 100%
rename from public/images/chad_fowler.png
rename to public/images/speakers/chad_fowler.png
diff --git a/public/images/ilya-grigorik.jpg b/public/images/speakers/ilya-grigorik.jpg
similarity index 100%
rename from public/images/ilya-grigorik.jpg
rename to public/images/speakers/ilya-grigorik.jpg
diff --git a/public/images/james_gray.png b/public/images/speakers/james_gray.png
similarity index 100%
rename from public/images/james_gray.png
rename to public/images/speakers/james_gray.png
diff --git a/public/images/mark_bates.jpg b/public/images/speakers/mark_bates.jpg
similarity index 100%
rename from public/images/mark_bates.jpg
rename to public/images/speakers/mark_bates.jpg
diff --git a/public/images/matt-aimonetti.jpg b/public/images/speakers/matt-aimonetti.jpg
similarity index 100%
rename from public/images/matt-aimonetti.jpg
rename to public/images/speakers/matt-aimonetti.jpg
diff --git a/public/images/sponsors/jumpstartlab-logo.png b/public/images/sponsors/jumpstartlab-logo.png
new file mode 100644
index 0000000..f037708
Binary files /dev/null and b/public/images/sponsors/jumpstartlab-logo.png differ
diff --git a/public/images/twitter-icon.png b/public/images/twitter-icon.png
deleted file mode 100644
index 9699dc7..0000000
Binary files a/public/images/twitter-icon.png and /dev/null differ
diff --git a/public/index.html b/public/index.html
index 5c3057f..5cb6e09 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2,8 +2,11 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="stylesheets/style.css" />
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
+  <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4"><a href="training">Training</a></li>
diff --git a/public/location.html b/public/location.html
index 160e17e..0f20327 100644
--- a/public/location.html
+++ b/public/location.html
@@ -2,8 +2,11 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="stylesheets/style.css" />
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
+  <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4"><a href="training">Training</a></li>
@@ -94,9 +97,7 @@ <h3>Hotel Accommodations</h3>
 	            </div>
 				<div class="quote">
 					<p class="locationAction">Request a quote below from Hawaii-Aloha Travel:</br>
-						<a id="registrationButton" href="http://hawaii-aloha.com/html/alohaconf.html">
-							<span>Request a Quote!</span>
-						</a>
+						<a id="registrationButton" href="http://hawaii-aloha.com/html/alohaconf.html"><span>Request a Quote!</span></a>
 					</p>
 				</div>
           		<div class='clear'></div>
diff --git a/public/media.html b/public/media.html
index 67d51cb..64e8a9a 100644
--- a/public/media.html
+++ b/public/media.html
@@ -2,8 +2,11 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="stylesheets/style.css" />
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
+  <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4"><a href="training">Training</a></li>
@@ -57,10 +60,10 @@ <h1 id="title">Media</h1>
         <section id="registrationAvailable">
       <div id="info">
       </div>
-      <section id="speakers">
+      <section id="speakers" class="badges">
         <h3>Badges</h3>
           <div class='speaker first'>
-            <p>Speaking</p>
+            <p>Speaking Badge</p>
             <img src='/images/aloharuby-badge-speaker.jpg'>
             <p><code>
               &lt;a href="https://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-speaker.jpg" alt="I Am Speaking At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Speaking At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
@@ -69,7 +72,7 @@ <h3>Badges</h3>
           </div>
           
           <div class='speaker first'>
-            <p>Attending</p>
+            <p>Attending Badge</p>
             <img src='/images/aloharuby-badges-attendant.jpg'>
             <p><code>
               &lt;a href="https://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-attendant.jpg" alt="I Am Attending At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Attending At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
@@ -78,7 +81,7 @@ <h3>Badges</h3>
           </div>
           
           <div class='speaker last'>
-            <p>Sponsoring</p>
+            <p>Sponsoring Badge</p>
             <img src='/images/aloharuby-badge-sponsor.jpg'>
             <p><code>
               &lt;a href="http://aloharubyconf.com"&gt;&lt;img src="https://www.aloharubyconf.com/images/aloharuby-badge-sponsor.jpg" alt="I Am Sponsoring At Aloha Ruby Conference, The Hawaii Ruby Conference" title="I Am Sponsoring At Aloha Ruby Conference, The Hawaii Ruby Conference" width="288" height="202" /&gt;&lt;/a&gt;
diff --git a/public/program.html b/public/program.html
index 90d4df3..2e6c3e7 100644
--- a/public/program.html
+++ b/public/program.html
@@ -2,8 +2,11 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="stylesheets/style.css" />
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
+  <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4"><a href="training">Training</a></li>
@@ -62,7 +65,7 @@ <h1 id="title">Program</h1>
         <h3>Speakers</h3>
               <div class='speaker first'>
           <div class="imageInfo">
-                  <img src='/images/aaron-patterson.png' class='speaker' width='150' height='150' />
+                  <img src='/images/speakers/aaron-patterson.png' class='speaker' width='150' height='150' />
                   <div class="clear"></div>
             <div class="socialmedia">
                       <a class="twitter" href="https://twitter.com/#!/tenderlove">@tenderlove</a>
@@ -72,6 +75,7 @@ <h3>Speakers</h3>
           </div>
                 <div class="speaker-content">
                   <div class='name'>Aaron Patterson</div>
+				  <div class='company'><em>AT&amp;T Interactive</em></div>
                   <div class='session'><strong>Keynote</strong></div>
                   <p>When he isn’t ruining people’s lives by writing software like
                   phuby, enterprise, and neversaydie, Aaron can be found writing
@@ -86,7 +90,7 @@ <h3>Speakers</h3>
 
               <div class='speaker'>
           <div class="imageInfo">
-                  <img src='/images/chad_fowler.png' class='speaker' width='150' height='150' />
+                  <img src='/images/speakers/chad_fowler.png' class='speaker' width='150' height='150' />
             <div class="clear"></div>
             <div class="socialmedia">
               <a class="twitter" href="https://twitter.com/#!/chadfowler">@chadfowler</a>
@@ -96,6 +100,7 @@ <h3>Speakers</h3>
           </div>
                 <div class="speaker-content">
                   <div class='name'>Chad Fowler</div>
+					  <div class='company'><em>LivingSocial</em></div>
                   <div class='session'></div>
                   <p>VP Engineering at LivingSocial, author, technologist, consultant, speaker, teacher, musician, organizer.</p>
                 </div>
@@ -104,7 +109,7 @@ <h3>Speakers</h3>
 
               <div class='speaker'>
           <div class="imageInfo">
-            <img src='/images/ilya-grigorik.jpg' class='speaker' width='150' height='150' />
+            <img src='/images/speakers/ilya-grigorik.jpg' class='speaker' width='150' height='150' />
             <div class="clear"></div>
             <div class="socialmedia">
               <a class="twitter" href="https://twitter.com/#!/igrigorik">@igrigorik</a>
@@ -114,6 +119,7 @@ <h3>Speakers</h3>
           </div>
                 <div class="speaker-content">
                   <div class='name'>Ilya Grigorik</div>
+				  <div class='company'><em>Google</em></div>
                   <div class='session'></div>
                   <p>Ilya Grigorik is a developer, an open-source and Ruby evangelist,
                   a data-geek, and a proverbial early adopter of all things digital.
@@ -128,7 +134,7 @@ <h3>Speakers</h3>
 
               <div class='speaker'>
           <div class="imageInfo">
-                  <img src='/images/matt-aimonetti.jpg' class='speaker' width='150' height='150' />
+                  <img src='/images/speakers/matt-aimonetti.jpg' class='speaker' width='150' height='150' />
             <div class="clear"></div>
             <div class="socialmedia">
               <a class="twitter" href="https://twitter.com/#!/merbist">@merbist</a>
@@ -138,6 +144,7 @@ <h3>Speakers</h3>
           </div>
                 <div class="speaker-content">
                   <div class='name'>Matt Aimonetti</div>
+				  <div class='company'><em>LivingSocial</em></div>
                   <div class='session'></div>
                   <p>R&amp;D Engineer at LivingSocial - Former Sony PlayStation developer.</p>
                 </div>
@@ -146,7 +153,7 @@ <h3>Speakers</h3>
 
               <div class='speaker'>
           <div class="imageInfo">
-                  <img src='/images/mark_bates.jpg' class='speaker' width='150' height='150' />
+                  <img src='/images/speakers/mark_bates.jpg' class='speaker' width='150' height='150' />
             <div class="clear"></div>
                   <div class="socialmedia">
                     <!--<a class="twitter" href=""></a></p>-->
@@ -156,6 +163,7 @@ <h3>Speakers</h3>
           </div>
                 <div class="speaker-content">
                   <div class='name'>Mark Bates</div>
+				  <div class='company'><em>Meta42 Labs, LLC</em></div>
                   <div class='session'></div>
                   <p>Mark Bates is the founder and chief architect of the Boston, MA based consulting
                      company, Meta42 Labs. Mark spends his days focusing on new application development
@@ -177,7 +185,7 @@ <h3>Speakers</h3>
 
               <div class='speaker'>
                 <div class="imageInfo">
-                  <img src='/images/james_gray.png' class='speaker' width='150' height='150' />
+                  <img src='/images/speakers/james_gray.png' class='speaker' width='150' height='150' />
                   <div class="clear"></div>
                   <div class="socialmedia">
                     <a class="twitter" href="https://twitter.com/#!/JEG2">@JEG2</a>
@@ -187,6 +195,7 @@ <h3>Speakers</h3>
                 </div>
                 <div class="speaker-content">
                   <div class='name'>James Edward Gray</div>
+				  <div class='company'><em>Gray Productions Software Inc.</em></div>
                   <div class='session'>
                     <strong>Session:</strong> Ten Things You Didn't Know Ruby Could Do
                   </div>
@@ -207,6 +216,7 @@ <h3>Speakers</h3>
                 </div>
                 <div class="speaker-content">
                   <div class='name'>Zach Holman</div>
+				  <div class='company'><em>GitHub</em></div>
                   <div class='session'>
                     <strong>Session:</strong> Ruby: You've Changed, Bro.
                   </div>
@@ -227,6 +237,7 @@ <h3>Speakers</h3>
                 </div>
                 <div class="speaker-content">
                   <div class='name'>Wesley Beary</div>
+				  <div class='company'><em>Heroku</em></div>
                   <div class='session'>
                     <strong>Session:</strong> Maintain Less, Mentor More: Community Building Techniques from Open Source
                   </div>
diff --git a/public/registration.html b/public/registration.html
index e780707..0df879c 100644
--- a/public/registration.html
+++ b/public/registration.html
@@ -2,8 +2,11 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="stylesheets/style.css" />
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
+  <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4"><a href="#">Training</a></li>
diff --git a/public/sponsors.html b/public/sponsors.html
index ca85229..139fdbc 100644
--- a/public/sponsors.html
+++ b/public/sponsors.html
@@ -2,8 +2,11 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="stylesheets/style.css" />
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
+  <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3 current"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4"><a href="training">Training</a></li>
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 4b37515..c46049b 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -220,7 +220,7 @@ div.twitter{
 }
 
 #footer div.socialMedia a.twitter{
-  background: url('../images/twitter-icon.png') no-repeat 0 0;
+  background: url('../images/icons/twitter-icon.png') no-repeat 0 0;
   width: 37px;
   height: 0;
   padding: 28px 0 0;
@@ -229,7 +229,7 @@ div.twitter{
 }
 
 #footer div.socialMedia a.googlePlus{
-  background: url('../images/google-icon.png') no-repeat 0 0;
+  background: url('../images/icons/google-icon.png') no-repeat 0 0;
   width: 30px;
   height: 0;
   padding: 30px 0 0;
@@ -332,7 +332,7 @@ div.twitter{
 }
 
 #registrationButton span, .registrationButton span {
-  display: block;
+  	display: block !important;
     text-align: center;
     font-size: 28px;
     font-family: 'Museo-700', sans-serif;
@@ -424,7 +424,7 @@ div.twitter{
 }
 
 #registrationAvailable h3{
-  background: url('../images/icon-registration.png') no-repeat 0 7px;
+  background: url('../images/icons/icon-registration.png') no-repeat 0 7px;
   padding: 0 0 0 50px;
 }
 
@@ -449,12 +449,12 @@ div.twitter{
 }
 
 #location h2#title{
-  background: url('../images/icon-location.png') no-repeat 0 7px;
+  background: url('../images/icons/icon-location.png') no-repeat 0 7px;
   padding: 0 0 0 30px;
 }
 
 a.learnMore{
-  background: url('../images/arrow.png') no-repeat 95px 5px;
+  background: url('../images/icons/arrow.png') no-repeat 95px 5px;
   font-size: 16px;
   color: #bf7334;
   text-shadow: 1px 2px 0px rgba(255,255,255, 0.4);
@@ -564,11 +564,11 @@ a.learnMore{
 }
 
 #speakerSignUp h4{
-  background: url('../images/icon-speakers.png') no-repeat 0 7px;
+  background: url('../images/icons/icon-speakers.png') no-repeat 0 7px;
 }
 
 #sponsorSignUp h4, #currentSponsors h4{
-  background: url('../images/icon-sponsors.png') no-repeat 0 7px;
+  background: url('../images/icons/icon-sponsors.png') no-repeat 0 7px;
 }
 
 #mainContent.sub #registrationAvailable h4{
@@ -576,10 +576,14 @@ a.learnMore{
   color: #bf7334;
 }
 
-#currentSponsors p{
+#currentSponsors p, #schedule.sidebar .sponsorInfo p{
 	text-align: center;
 }
 
+#schedule.sidebar .sponsorInfo p{
+	margin: 20px 0 0;
+}
+
 #currentSponsors p a{
 	margin: 0 auto 30px;
 	display: block;
@@ -651,8 +655,9 @@ a.learnMore{
 #location table td.code span.line {
   display: block;
   font-family: monospace;
-  padding-top: 2px;
+  padding-top: 5px;
   line-height: 18px;
+  font-size: 14px;
 }
 
 .quote{
@@ -698,12 +703,19 @@ div.imageInfo{
 .name{
 	font-size: 24px;
 	text-shadow: 1px 2px 0px rgba(255, 255, 255, 0.5);
+	padding: 0 0 5px !important;
 }
 
 .name, .session{
         padding: 0 0 10px
 }
 
+.company em{
+    padding: 0 0 10px;
+    display: block;
+    font-size: 14px;
+}
+
 div.speaker-content{
   float: left;
   width: 380px;
@@ -722,27 +734,31 @@ div.speaker .socialmedia a{
 }
 
 div.speaker .socialmedia a.twitter{
-	background: url('../images/icon-twitter.png') no-repeat left 0px;
+	background: url('../images/icons/icon-twitter.png') no-repeat left 0px;
 	height: 17px;
 	padding: 3px 0 0 28px;
   	margin: 0 0 6px 0px !important;
 }
 
 div.speaker .socialmedia a.github{
-	background: url('../images/icon-github.png') no-repeat left 0px;
+	background: url('../images/icons/icon-github.png') no-repeat left 0px;
 	padding: 8px 0 0 35px;
 }
 
 div.speaker .socialmedia a.website{
-	background: url('../images/icon-world.png') no-repeat 8px 0px;
+	background: url('../images/icons/icon-world.png') no-repeat 8px 0px;
 }
 
-section#speakers{
+section#speakers, section#trainingInfo, section#speakers.badges{
 	width: 610px;
 	float: left;
 	margin: 20px 0 0;
 }
 
+section#trainingInfo, section#speakers.badges{
+    margin: 0; 
+}
+
 aside#sidebar{
 	width: 260px;
 	float: left;
@@ -848,7 +864,10 @@ form li.section {
 
 form li#foli141{
 	/*width: 100%;*/
-	padding: 0 0 30px;
+	padding: 0 0 30px;	
+}
+
+form div.clear.hr{
 	border-bottom: 2px solid rgba(143, 127, 110, .4);	
 }
 
@@ -938,6 +957,18 @@ form li.focused {
 display: none !important;
 }
 
+/***************************
+Media Page
+***************************/
+
+section#speakers.badges div.speaker img{
+	margin: 0 0 20px;
+}
+
+section#speakers.badges div.speaker.first code {
+	font-size: 14px;
+}
+
 
 /***************************
 Classes
@@ -956,6 +987,7 @@ img.speaker, .speaker-info {
 }
 
 img.speaker {
+    background: rgba(255, 255, 255, 0.65);
 }
 
 .speaker-info {
diff --git a/public/training.html b/public/training.html
index a859702..9ac695d 100644
--- a/public/training.html
+++ b/public/training.html
@@ -2,8 +2,11 @@
 <html lang="en">
 <head>
   <meta charset="UTF-8">
-  <link rel="stylesheet" href="stylesheets/style.css" />
   <link rel="stylesheet" href="stylesheets/wufoo.css" />
+  <link rel="stylesheet" href="stylesheets/style.css" />
+
+	<!-- Icons -->
+	<link rel="shortcut icon" href="images/icons/favicon.ico">
   <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js"></script>
   <script type="text/javascript">
     if (typeof jQuery == 'undefined')
@@ -35,7 +38,7 @@
           <li class="page-3"><a href="sponsors">Sponsors</a></li>
         </ul>
         <a id="logo" class="home" href="index.html" title="Return to the homepage">
-          <img src="images/logo.png" alt="Aloha Ruby Conference" />
+          <img src="images/aloharuby-logo.png" alt="Aloha Ruby Conference" />
         </a>
         <ul id="leftLinks">
           <li class="page-4 current"><a href="training">Training</a></li>
@@ -56,78 +59,89 @@ <h1 id="title">Training</h1>
       
       <section id="mainContent" class="sub">
         <section id="location">
-          <h3 class="entry-title">Advanced Patterns with Rails</h3>
-
-          <p>Welcome! First, open this page in your browser:</p>
-          <p><a href="http://jumpstartlab.com/codemash-pm">http://jumpstartlab.com/codemash-pm</a></p>
-          <h2>Setting Expectations</h2>
-          <h3>Is this the right session for you?</h3>
-          <p>You belong here if:</p>
-          <ul>
-            <li>You feel <em>very</em> comfortable working with Ruby and Rails</li>
-            <li>You have built several Rails projects</li>
-            <li>You’re interested in some new ideas</li>
-            <li>You’re willing to wrestle with things that might not work the first time</li>
-          </ul>
-
-          <p>This is <em>not</em> a good session for you if:</p>
-
-          <ul>
-            <li>You’re new to Ruby/Rails</li>
-            <li>You were in my session this morning</li>
-            <li>You want everything to go smoothly</li>
-            <li>You only came for the "worker pattern", because I decided it didn’t fit</li>
-          </ul>
-
-          <h3>Are you prepared?</h3>
-          <p>You need:</p>
-          <ul>
-            <li>To join the chatroom at <a href="http://jumpstartlab.com/chat">http://jumpstartlab.com/chat</a></li>
-            <li>Ruby 1.9.2 or greater</li>
-            <li>Rails 3.1.3 or greater</li>
-            <li>Setup the sample project</li>
-          </ul>
-
-          <div class="note">
-            <p>Get the JSBlogger project from Github and run setup procedures:</p>
-                <table>
-                  <tbody>
-                    <tr>
-                      <td class="code">
-                        <span class="line">1 <span>git clone git://github.com/JumpstartLab/jsblogger_advanced.git</span></span>
-                        <span class="line">2 <span>cd jsblogger_advanced</span></span>
-                        <span class="line">3 <span>bundle</span></span>
-                        <span class="line">4 <span>rake db:setup</span></span>
-                        <span class="line">5 <span>rake</span></span>
-                      </td>
-                    </tr>
-                  </tbody>
-                </table>
-              <p>All existing tests should pass. Optionally, run the tests continuously while developing by running <code>guard</code></p>
-            </div>
-
-            <p>You can also run the tests continuously as we make changes by starting <code>guard</code></p>
-
-            <h2>The Plan</h2>
-            <p>We’re going to approach this in four segments of about one hour each.</p>
-
-            <h3>Decorator Pattern with Draper</h3>
-            <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/decorators.html">http://tutorials.jumpstartlab.com/topics/decorators.html</a></p>
-
-            <h3>Slimming Controllers</h3>
-            <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/controllers/slimming_controllers.html">http://tutorials.jumpstartlab.com/topics/controllers/slimming_controllers.html</a></p>
-
-            <h3>Facade Pattern</h3>
-            <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/models/facade_pattern.html">http://tutorials.jumpstartlab.com/topics/models/facade_pattern.html</a></p>
-
-            <h3>Better Models with Modules</h3>
-            <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/models/modules.html">http://tutorials.jumpstartlab.com/topics/models/modules.html</a></p>
-
-            <h2>Contributing</h2>
-            <p>You’re strongly invited to help improve these tutorials, even while we’re running the session. All the text is available on Github, so you can edit it right in the browser. Hit the "Feedback" tab on the left side of any page.</p>
-
-            <p>Enjoy!</p>
-
+          <h3 class="entry-title">Training Session: Advanced Patterns with Rails</h3>
+		  
+		  <section id="trainingInfo">
+          	<p>Welcome! First, open this page in your browser:</p>
+	          <p><a href="http://jumpstartlab.com/codemash-pm">http://jumpstartlab.com/codemash-pm</a></p>
+	          <h2>Setting Expectations</h2>
+	          <h3>Is this the right session for you?</h3>
+	          <p>You belong here if:</p>
+	          <ul>
+	            <li>You feel <em>very</em> comfortable working with Ruby and Rails</li>
+	            <li>You have built several Rails projects</li>
+	            <li>You’re interested in some new ideas</li>
+	            <li>You’re willing to wrestle with things that might not work the first time</li>
+	          </ul>
+
+	          <p>This is <em>not</em> a good session for you if:</p>
+
+	          <ul>
+	            <li>You’re new to Ruby/Rails</li>
+	            <li>You were in my session this morning</li>
+	            <li>You want everything to go smoothly</li>
+	            <li>You only came for the "worker pattern", because I decided it didn’t fit</li>
+	          </ul>
+
+	          <h3>Are you prepared?</h3>
+	          <p>You need:</p>
+	          <ul>
+	            <li>To join the chatroom at <a href="http://jumpstartlab.com/chat">http://jumpstartlab.com/chat</a></li>
+	            <li>Ruby 1.9.2 or greater</li>
+	            <li>Rails 3.1.3 or greater</li>
+	            <li>Setup the sample project</li>
+	          </ul>
+
+	          <div class="note">
+	            <p>Get the JSBlogger project from Github and run setup procedures:</p>
+	                <table>
+	                  <tbody>
+	                    <tr>
+	                      <td class="code">
+	                        <span class="line">1 <span>git clone git://github.com/JumpstartLab/jsblogger_advanced.git</span></span>
+	                        <span class="line">2 <span>cd jsblogger_advanced</span></span>
+	                        <span class="line">3 <span>bundle</span></span>
+	                        <span class="line">4 <span>rake db:setup</span></span>
+	                        <span class="line">5 <span>rake</span></span>
+	                      </td>
+	                    </tr>
+	                  </tbody>
+	                </table>
+	              <p>All existing tests should pass. Optionally, run the tests continuously while developing by running <code>guard</code></p>
+	            </div>
+
+	            <p>You can also run the tests continuously as we make changes by starting <code>guard</code></p>
+
+	            <h2>The Plan</h2>
+	            <p>We’re going to approach this in four segments of about one hour each.</p>
+
+	            <h3>Decorator Pattern with Draper</h3>
+	            <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/decorators.html">http://tutorials.jumpstartlab.com/topics/decorators.html</a></p>
+
+	            <h3>Slimming Controllers</h3>
+	            <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/controllers/slimming_controllers.html">http://tutorials.jumpstartlab.com/topics/controllers/slimming_controllers.html</a></p>
+
+	            <h3>Facade Pattern</h3>
+	            <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/models/facade_pattern.html">http://tutorials.jumpstartlab.com/topics/models/facade_pattern.html</a></p>
+
+	            <h3>Better Models with Modules</h3>
+	            <p>Open the tutorial at <a href="http://tutorials.jumpstartlab.com/topics/models/modules.html">http://tutorials.jumpstartlab.com/topics/models/modules.html</a></p>
+
+	            <h2>Contributing</h2>
+	            <p>You’re strongly invited to help improve these tutorials, even while we’re running the session. All the text is available on Github, so you can edit it right in the browser. Hit the "Feedback" tab on the left side of any page.</p>
+
+	            <p>Enjoy!</p>
+			</section>
+			<aside id="schedule" class="sidebar">
+				<h3>Sponsored by:</h3>
+				<div class="sponsorInfo">
+					<p>
+						<a href='http://jumpstartlab.com/' alt="JumpstartLab">
+							<img src='/images/sponsors/jumpstartlab-logo.png' />
+						</a>
+					</p>
+				</div>
+				</aside>
             <div class='clear'></div>
             </section>
             </section><!-- End of Main Content -->