diff --git a/app/assets/javascripts/findSession.js b/app/assets/javascripts/findSession.js
index 4e280d62d..07ee2aa82 100644
--- a/app/assets/javascripts/findSession.js
+++ b/app/assets/javascripts/findSession.js
@@ -126,7 +126,6 @@
             for (i=0; i < session.participants.length; i++) {
                 participant = session.participants[i];
                 // this session participant is a friend
-                //alert(participant.user.name);
                 if (participant.user.is_friend) {
                     return true;
                 }
@@ -243,7 +242,6 @@
         * Initialize, providing an instance of the SessionLatency class.
         */
         function initialize(latency) {
-            genreSelector = new context.JK.GenreSelector(app);
             genreSelector.initialize('Any genre', 0, $('#find-session-form'));
 
             if (latency) {
diff --git a/app/assets/javascripts/genreSelector.js b/app/assets/javascripts/genreSelector.js
index 35346ff05..052f137dc 100644
--- a/app/assets/javascripts/genreSelector.js
+++ b/app/assets/javascripts/genreSelector.js
@@ -88,7 +88,7 @@
             //     selectedGenres.push($(this).val());
             // });
 
-            selectedGenres.push($('genre-list', _form).val());
+            selectedGenres.push($('#genre-list', _form).val());
 
             return selectedGenres;
         }
diff --git a/app/assets/javascripts/layout.js b/app/assets/javascripts/layout.js
index c0bbda217..6c2258097 100644
--- a/app/assets/javascripts/layout.js
+++ b/app/assets/javascripts/layout.js
@@ -376,7 +376,7 @@
             screenEvent(previousScreen, 'beforeHide', data);
             screenEvent(currentScreen, 'beforeShow', data);
 
-            if (currentScreen == 'home' || currentScreen == 'session') {
+            if (currentScreen == 'home' || currentScreen == 'session' || currentScreen == 'createSession' || currentScreen == 'findSession') {
                 sidebarVisible = true;
             } else {
                 sidebarVisible = false;
diff --git a/app/assets/stylesheets/client/createSession.css.scss b/app/assets/stylesheets/client/createSession.css.scss
index 332f30238..3e09ea58e 100644
--- a/app/assets/stylesheets/client/createSession.css.scss
+++ b/app/assets/stylesheets/client/createSession.css.scss
@@ -1,16 +1,16 @@
 .session-left {
-    width:45%;
+    width:40%;
     float:left;
     padding-top:10px;
     margin-left:35px;
 }
 
 .session-right {
-    width:45%;
+    width:50%;
     float:right;
     font-size:13px;
     padding-top:10px;
-    margin-right:10px;
+    margin-right:35px;
 }
 
 .session-description {
@@ -23,6 +23,10 @@
     padding-bottom:5px;
 }
 
+.radio-text {
+    font-size:13px;
+}
+
 .friendbox {
     padding:5px;
     height:60px;
@@ -38,8 +42,6 @@
 .terms {
     font-size:11px;
     width:auto;
-    margin-right:10px;
-    margin-left:25px;
     display:block;
 }
 
diff --git a/app/assets/stylesheets/client/jamkazam.css.scss b/app/assets/stylesheets/client/jamkazam.css.scss
index da4f5d3d0..8f85f5df2 100644
--- a/app/assets/stylesheets/client/jamkazam.css.scss
+++ b/app/assets/stylesheets/client/jamkazam.css.scss
@@ -172,14 +172,13 @@ input[type="button"] {
 
 /* Autocomplete */
 .autocomplete { 
-    border:1px solid #999;
     background:$ColorScreenBackground;
     color:$ColorText;
     cursor:default;
     text-align:left;
     max-height:350px;
     overflow:auto;
-    margin:-6px 6px 6px -6px;
+    margin:-1px 6px 6px -6px;
     _height:350px;  /* IE6 specific: */ 
     _margin:0;
     _overflow-x:hidden;
@@ -191,10 +190,12 @@ input[type="button"] {
 }
 
 .autocomplete div { 
-    padding:10px 10px 10px 10px;
+    padding:5px 5px 5px 5px;
     white-space:nowrap;
     overflow:hidden;
-    border:1px solid #999;
+    border-bottom:1px solid #999;
+    border-left:1px solid #999;
+    border-right:1px solid #999;
     text-align:center;
 }
 
diff --git a/app/assets/stylesheets/client/screen_common.css.scss b/app/assets/stylesheets/client/screen_common.css.scss
index d8a8eda0e..ca33ea7e0 100644
--- a/app/assets/stylesheets/client/screen_common.css.scss
+++ b/app/assets/stylesheets/client/screen_common.css.scss
@@ -9,27 +9,6 @@
     border: 1px solid $ColorScreenPrimary;
     background-color:$ColorScreenBackground;
 
-    .button-grey {
-        margin:0px 8px 0px 8px;
-        height: 16px;
-        background-color:#666;
-        border: solid 1px #868686;
-        outline:solid 2px #666;
-        padding:3px 10px;
-        font-family:raleway;
-        font-size:12px;
-        font-weight:300;
-        cursor:pointer;
-        color:#ccc;
-        text-decoration:none;
-    }
-
-    .button-grey:hover {
-        background-color:#999;
-        color:#FFF;
-    }
-
-
     .footer button {
         margin:1em 0em 1em 1em;
     }
@@ -249,6 +228,10 @@ a img {
 	float:right;
 }
 
+.mr5 {
+    margin-right:5px;
+}
+
 .mr10 {
 	margin-right:10px;
 }
@@ -265,6 +248,10 @@ a img {
 	margin-right:35px;
 }
 
+.mr120 {
+    margin-right:120px;
+}
+
 .ml5 {
     margin-left:5px;
 }
@@ -277,6 +264,10 @@ a img {
 	margin-left:20px;
 }
 
+.ml25 {
+    margin-left:25px;
+}
+
 .ml30 {
 	margin-left:30px;
 }
@@ -289,10 +280,18 @@ a img {
     margin-top:5px;
 }
 
+.mt10 {
+    margin-top:10px;
+}
+
 .mt35 {
     margin-top:35px;
 }
 
+.mt40 {
+    margin-top:40px;
+}
+
 .mb15 {
     margin-bottom:15px;
 }
diff --git a/app/views/clients/_createSession.html.erb b/app/views/clients/_createSession.html.erb
index 254565286..98a1026b5 100644
--- a/app/views/clients/_createSession.html.erb
+++ b/app/views/clients/_createSession.html.erb
@@ -54,8 +54,8 @@
                             </div>
 
                             <div class="left">
-                                <input type="radio" name="musician-access-option" checked="checked" value="false" />&nbsp;Open&nbsp;&nbsp;
-                                <input type="radio" name="musician-access-option" value="true" />&nbsp;By Approval
+                                <input type="radio" name="musician-access-option" checked="checked" value="false" />&nbsp;<span class="radio-text">Open</span>&nbsp;&nbsp;
+                                <input type="radio" name="musician-access-option" value="true" />&nbsp;<span class="radio-text">By Approval</span>
                             </div>
                         </div>
 
@@ -71,8 +71,8 @@
                             </div>
 
                             <div class="left op50">
-                                <input type="radio" name="fan-chat-option" value="true" disabled="disabled" />&nbsp;Chat&nbsp;&nbsp;
-                                <input type="radio" name="fan-chat-option" checked="checked" value="false" disabled="disabled" />&nbsp;No Fan Chat
+                                <input type="radio" name="fan-chat-option" value="true" disabled="disabled" />&nbsp;<span class="radio-text">Chat</span>&nbsp;&nbsp;
+                                <input type="radio" name="fan-chat-option" checked="checked" value="false" disabled="disabled" />&nbsp;<span class="radio-text">No Fan Chat</span>
                             </div>
                         </div>
                     </div>
@@ -84,14 +84,14 @@
 
                         <div style="width:78%;">
                             <div class="left" style="margin-top:10px;">
-                                Start typing friends' names:
+                                Start typing friends' names or:
                             </div>
                             <div class="right">
                                 <a href="#" id="btn-choose-friends" class="button-grey">CHOOSE FRIENDS</a>
                             </div>
                         </div>
 
-                        <div class="clearall" />
+                        <div class="clearall"></div>
                         <br />
 
                         <!-- friend invitation box -->
@@ -103,7 +103,7 @@
                         <div class="mt35 mb15">
                             Invite friends and contacts to join you on JamKazam from:
                         </div>
-                        <div>
+                        <div style="width:78%">
                             <div class="left mr20">
                                 <div class="left">
                                     <%= image_tag("content/icon_facebook.png", :size => "24x24", :align => "absmiddle") %>
@@ -128,24 +128,28 @@
                                 </div>
                                 <div class="right mt5 ml5">E-mail</div>
                             </div>
-                        </div>
-                        <br clear="all" />
-                        <!-- terms -->
-                        <div style="margin-top:40px;">
-                            <div class="terms-checkbox">
-                                <input type="checkbox" />
+                            <div class="clearall"></div>
+                            <br clear="all"/>
+                            <br clear="all"/>
+                            <!-- terms -->
+                            <div>
+                                <div class="terms-checkbox">
+                                    <input type="checkbox" />
+                                </div>
+                                <div class="terms ml25">
+                                    I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the Creative Commons CC BY-NC-SA license in accordance with the JamKazam Terms of Service.
+                                </div>
                             </div>
-                            <div class="terms">
-                                I agree that intellectual property ownership of any musical works created during this session shall be governed by the terms of the Creative Commons CC BY-NC-SA license in accordance with the JamKazam Terms of Service.
+                            <br clear="all"/>
+                            <br clear="all"/>
+                            <div class="right mt10">
+                                <div>
+                                    <a href="#" layout-link="home" class="button-grey">CANCEL</a>
+                                    <a href="#" id="btn-create-session" class="button-orange">JAM!</a>
+                                </div>
                             </div>
                         </div>
                     </div>
-                    <br clear="all" />
-                    <div class="right mr20">
-                        <a href="#" layout-link="home" class="button-grey">CANCEL</a>
-                        <a href="#" id="btn-create-session" class="button-orange">JAM!</a>
-                    </div>
-                    <br clear="all" />
                 </div>
             </div>
         </form>
diff --git a/app/views/clients/_findSession.html.erb b/app/views/clients/_findSession.html.erb
index fe5ad369c..d481e2f6b 100644
--- a/app/views/clients/_findSession.html.erb
+++ b/app/views/clients/_findSession.html.erb
@@ -43,9 +43,15 @@
             </div>
             <div class="content-scroller">
                 <div class="content-wrapper" style="padding-left:35px;padding-top:10px;">
-                    <%= render :partial => "sessionList", :locals => {:title => "sessions you're invited to", :category => "sessions-invitations"} %><br /><br />
-                    <%= render :partial => "sessionList", :locals => {:title => "sessions with friends or bandmates", :category => "sessions-friends"} %><br /><br />
-                    <%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %>
+                    <div>
+                        <%= render :partial => "sessionList", :locals => {:title => "sessions you're invited to", :category => "sessions-invitations"} %>
+                    </div>
+                    <div>
+                        <%= render :partial => "sessionList", :locals => {:title => "sessions with friends or bandmates", :category => "sessions-friends"} %>
+                    </div>
+                    <div>
+                        <%= render :partial => "sessionList", :locals => {:title => "other sessions", :category => "sessions-other"} %>
+                    </div>
                 </div>
             </div>
         </form>
diff --git a/app/views/clients/index.html.erb b/app/views/clients/index.html.erb
index ba780ca05..35a3e4e74 100644
--- a/app/views/clients/index.html.erb
+++ b/app/views/clients/index.html.erb
@@ -9,14 +9,13 @@
 <%= render "ftue3" %>
 <%= render "sidebar" %>
 <%= render "createSession" %>
-<%= render "session" %>
 <%= render "findSession" %>
+<%= render "session" %>
 <%= render "profile" %>
 <%= render "feed" %>
 <%= render "testBridge" %>
 <%= render "account" %>
 <%= render "notify" %>
-<%= render "footer" %>
 
 <script type="text/javascript">
     $(function() {
diff --git a/features/step_definitions/create_session_steps.rb b/features/step_definitions/create_session_steps.rb
index 774e1de46..491407373 100644
--- a/features/step_definitions/create_session_steps.rb
+++ b/features/step_definitions/create_session_steps.rb
@@ -24,7 +24,7 @@ When /^I create a public music session$/ do
 
   # pick a genre, any genre
   sleep 3
-  page.find("form[id='create-session-form'] input[value='rock']").click
+  page.find("form[id='create-session-form'] select[id='genre-list']").click
 
   # fill in description
   page.fill_in 'description', :with => @session_description
@@ -63,7 +63,7 @@ Then /^I should be in a music session that another musician can find$/ do
 
   # and see the session with the same description we created earlier show up
   sleep 5
-    @second_session.find("tr[data-sortscore]").should have_content @session_description
+  @second_session.find("tr[data-sortScore]").should have_content @session_description
 end
 
 When /^that other musician should be able to join my public session$/ do