diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index b89d609..0f443b6 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -13,7 +13,7 @@ class TournamentsController < ApplicationController
     @wrestler = Wrestler.find(params[:wrestler][:originalId])
     respond_to do |format|
       if SwapWrestlers.new.swapWrestlers(params[:wrestler][:originalId], params[:wrestler][:swapId])
-        format.html { redirect_to @wrestler, notice: 'Wrestler was successfully swaped.' }
+        format.html { redirect_to "/tournaments/#{@wrestler.tournament.id}/brackets/#{@wrestler.weight.id}", notice: 'Wrestler was successfully swaped.' }
         format.json { render action: 'show', status: :created, location: @wrestler }
       end
     end
diff --git a/app/views/layouts/_lsidebar.html.erb b/app/views/layouts/_lsidebar.html.erb
index ccfabe7..4c04823 100644
--- a/app/views/layouts/_lsidebar.html.erb
+++ b/app/views/layouts/_lsidebar.html.erb
@@ -5,7 +5,7 @@
         <% if @tournament %>
             <div class="" style="padding-right: 1%;">
                 <h4>Tournament Links</h4>
-                <ul class="">
+                <ul>
                     <li><%= link_to "Tournament home" , "/tournaments/#{@tournament.id}/" %></li>
                     <li><%= link_to "Brackets" , "/tournaments/#{@tournament.id}/brackets" %></li>
                     <li><%= link_to "Bout Board" , "/tournaments/#{@tournament.id}/up_matches" %></li>
diff --git a/app/views/tournaments/_fourPoolQuarterBracket.html.erb b/app/views/tournaments/_fourPoolQuarterBracket.html.erb
index fbd94b2..4b07d9b 100644
--- a/app/views/tournaments/_fourPoolQuarterBracket.html.erb
+++ b/app/views/tournaments/_fourPoolQuarterBracket.html.erb
@@ -1,200 +1,131 @@
-<style>
-/*
- *  Flex Layout Specifics
-*/
-main{
-  display:flex;
-  flex-direction:row;
-}
-.round{
-  display:flex;
-  flex-direction:column;
-  justify-content:center;
-  width:200px;
-  list-style:none;
-  padding:0;
-}
-  .round .spacer{ flex-grow:1; }
-  .round .spacer:first-child,
-  .round .spacer:last-child{ flex-grow:.5; }
-
-  .round .game-spacer{
-    flex-grow:1;
-  }
-
-/*
- *  General Styles
-*/
-body{
-  font-family:sans-serif;
-  font-size:small;
-  padding:10px;
-  line-height:1.4em;
-}
-
-li.game{
-  padding-left:20px;
-}
-
-  li.game.winner{
-    font-weight:bold;
-  }
-  li.game span{
-    float:right;
-    margin-right:5px;
-  }
-
-  li.game-top{ border-bottom:1px solid #aaa; }
-
-  li.game-spacer{ 
-    border-right:1px solid #aaa;
-    min-height:40px;
-  }
-
-  li.game-bottom{ 
-    border-top:1px solid #aaa;
-  }
-
-
-</style>
-
-
-<h5>Championship Bracket After Pool</h5>
+<h5>Bracket After Pool</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "Quarter"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<% end %>
 	</ul>
 	<ul class="round round-2">
 		<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
-
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<% end %>
 	</ul>
 	<ul class="round round-3">
 		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-4">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "><%= match.winnerName %> <span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %> <span></span></li>
 		1st
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 		<% end %>	
 </main>
-</br>
-<h5>3rd/4th</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-2">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"> <%= match.winnerName %><span></span></li>
 		3rd
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
 </main>
-</br>
-<h5>Consolation Bracket After Pool</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<% end %>
 	</ul>
 	<ul class="round round-2">
 		<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-3">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"> <%= match.winnerName %><span></span></li>
 		5th
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
 </main>
-<br>
-<h5>7th/8th</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "7/8"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-2">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "><%= match.winnerName %> <span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %> <span></span></li>
 		7th
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
 </main>
-</br>
 
 
 
diff --git a/app/views/tournaments/_fourPoolSemiBracket.html.erb b/app/views/tournaments/_fourPoolSemiBracket.html.erb
index d52c13c..c6da986 100644
--- a/app/views/tournaments/_fourPoolSemiBracket.html.erb
+++ b/app/views/tournaments/_fourPoolSemiBracket.html.erb
@@ -1,191 +1,123 @@
-<style>
-/*
- *  Flex Layout Specifics
-*/
-main{
-  display:flex;
-  flex-direction:row;
-}
-.round{
-  display:flex;
-  flex-direction:column;
-  justify-content:center;
-  width:200px;
-  list-style:none;
-  padding:0;
-}
-  .round .spacer{ flex-grow:1; }
-  .round .spacer:first-child,
-  .round .spacer:last-child{ flex-grow:.5; }
-
-  .round .game-spacer{
-    flex-grow:1;
-  }
-
-/*
- *  General Styles
-*/
-body{
-  font-family:sans-serif;
-  font-size:small;
-  padding:10px;
-  line-height:1.4em;
-}
-
-li.game{
-  padding-left:20px;
-}
-
-  li.game.winner{
-    font-weight:bold;
-  }
-  li.game span{
-    float:right;
-    margin-right:5px;
-  }
-
-  li.game-top{ border-bottom:1px solid #aaa; }
-
-  li.game-spacer{ 
-    border-right:1px solid #aaa;
-    min-height:40px;
-  }
-
-  li.game-bottom{ 
-    border-top:1px solid #aaa;
-  }
-
-
-</style>
-
-
-<h5>Championship Bracket After Pool</h5>
+<h5>Bracket After Pool</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<% end %>
 	</ul>
 	<ul class="round round-2">
 		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-3">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %><span></span></li>
 		1st
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
 </main>
-</br>
 
-<h5>3rd/4th</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-2">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %><span></span></li>
 		3rd
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
 </main>
-</br>
 
 
-<h5>Consolation Bracket After Pool</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "Conso Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<% end %>
 	</ul>
 	<ul class="round round-2">
 		<% @matches.select{|m|m.bracket_position == "5/6"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-3">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %><span></span></li>
 		5th
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
 </main>
-<br>
-<h5>7th/8th</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "7/8"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-2">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %><span></span></li>
 		7th
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
 </main>
-</br>
 
 
 
diff --git a/app/views/tournaments/_twoPoolFinalBracket.html.erb b/app/views/tournaments/_twoPoolFinalBracket.html.erb
index a058c12..fc3aeb7 100644
--- a/app/views/tournaments/_twoPoolFinalBracket.html.erb
+++ b/app/views/tournaments/_twoPoolFinalBracket.html.erb
@@ -1,108 +1,46 @@
-<style>
-/*
- *  Flex Layout Specifics
-*/
-main{
-  display:flex;
-  flex-direction:row;
-}
-.round{
-  display:flex;
-  flex-direction:column;
-  justify-content:center;
-  width:200px;
-  list-style:none;
-  padding:0;
-}
-  .round .spacer{ flex-grow:1; }
-  .round .spacer:first-child,
-  .round .spacer:last-child{ flex-grow:.5; }
-
-  .round .game-spacer{
-    flex-grow:1;
-  }
-
-/*
- *  General Styles
-*/
-body{
-  font-family:sans-serif;
-  font-size:small;
-  padding:10px;
-  line-height:1.4em;
-}
-
-li.game{
-  padding-left:20px;
-}
-
-  li.game.winner{
-    font-weight:bold;
-  }
-  li.game span{
-    float:right;
-    margin-right:5px;
-  }
-
-  li.game-top{ border-bottom:1px solid #aaa; }
-
-  li.game-spacer{ 
-    border-right:1px solid #aaa;
-    min-height:40px;
-  }
-
-  li.game-bottom{ 
-    border-top:1px solid #aaa;
-  }
-
-
-</style>
-
-</br>
-<h5>Championship Match</h5>
+<h5>Bracket After Pool</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-2">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %><span></span></li>
 		1st
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 	</ul>
 		<% end %>
 </main>
 
-<h5>3rd/4th</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-2">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "><%= match.winnerName %> <span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %> <span></span></li>
 		3rd
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 	</ul>
 		<% end %>
 </main>
diff --git a/app/views/tournaments/_twoPoolSemiBracket.html.erb b/app/views/tournaments/_twoPoolSemiBracket.html.erb
index bb23f26..41ac11d 100644
--- a/app/views/tournaments/_twoPoolSemiBracket.html.erb
+++ b/app/views/tournaments/_twoPoolSemiBracket.html.erb
@@ -1,122 +1,59 @@
-<style>
-/*
- *  Flex Layout Specifics
-*/
-main{
-  display:flex;
-  flex-direction:row;
-}
-.round{
-  display:flex;
-  flex-direction:column;
-  justify-content:center;
-  width:200px;
-  list-style:none;
-  padding:0;
-}
-  .round .spacer{ flex-grow:1; }
-  .round .spacer:first-child,
-  .round .spacer:last-child{ flex-grow:.5; }
-
-  .round .game-spacer{
-    flex-grow:1;
-  }
-
-/*
- *  General Styles
-*/
-body{
-  font-family:sans-serif;
-  font-size:small;
-  padding:10px;
-  line-height:1.4em;
-}
-
-li.game{
-  padding-left:20px;
-}
-
-  li.game.winner{
-    font-weight:bold;
-  }
-  li.game span{
-    float:right;
-    margin-right:5px;
-  }
-
-  li.game-top{ border-bottom:1px solid #aaa; }
-
-  li.game-spacer{ 
-    border-right:1px solid #aaa;
-    min-height:40px;
-  }
-
-  li.game-bottom{ 
-    border-top:1px solid #aaa;
-  }
-
-
-</style>
-
-</br>
-<h5>Championship Bracket After Pool</h5>
+<h5>Bracket After Pool</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "Semis"}.sort_by{|m| m.bracket_position_number}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<% end %>
 	</ul>
 	<ul class="round round-2">
 		<% @matches.select{|m|m.bracket_position == "1/2"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-3">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %><span></span></li>
 		1st
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
 </main>
-</br>
 
-<h5>3rd/4th</h5>
 <main id="bracket">
 	<ul class="round round-1">
 		<% @matches.select{|m|m.bracket_position == "3/4"}.each do |match| %>
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 		<li class="game game-top "><%= match.w1_name %> <span></span></li>
-		<li class="game game-spacer"><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
+		<li><%= match.bout_number %> <%= match.bracketScore %>&nbsp;</li>
 		<li class="game game-bottom "><%= match.w2_name %><span></span></li>
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>
 	<ul class="round round-2">
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
-		<li class="game game-top "> <%= match.winnerName %><span></span></li>
+		<li class="bracket-winner"><%= match.winnerName %><span></span></li>
 		3rd
 
-		<li class="spacer">&nbsp;</li>
+		<li>&nbsp;</li>
 		
 	</ul>	
 		<% end %>
diff --git a/app/views/tournaments/all_brackets.html.erb b/app/views/tournaments/all_brackets.html.erb
index 9182666..fe213c7 100644
--- a/app/views/tournaments/all_brackets.html.erb
+++ b/app/views/tournaments/all_brackets.html.erb
@@ -1,6 +1,6 @@
-<% cache ["all_brackets", @tournament] do %>
+<% cache ["#{@tournament.id}_all_brackets", @tournament] do %>
 
-    <style>
+<style>
     .pagebreak { 
       page-break-after: always;
       border: none;
@@ -13,39 +13,87 @@
         left: 1in;
         height: 1in;
     }
-    
-    
-    
-    </style>
+/*
+ *  Bracket Layout Specifics
+*/
+main, ul {
+  display:flex;
+}
+
+ul {
+  flex-direction:column;
+  width: 100px;
+  list-style:none;
+  padding:0;
+}
+
+.game + li {
+  flex-grow:1;
+}
+
+li:first-child,li:last-child {
+  flex-grow:.5;
+}
+
+.game {
+  padding-left:5px;
+}
+
+.winner {
+  font-weight:bold;
+}
+
+.game span {
+  float:right;
+  margin-right:5px;
+}
+
+.game-top {
+  border-bottom:1px solid #aaa;
+}
+
+.game-top + li {
+  border-right:1px solid #aaa; min-height:30px;
+}
+
+.bracket-winner {
+  border-bottom:1px solid #aaa;
+}
+
+.game-bottom {
+  border-top:1px solid #aaa;
+}
+</style>
     
     <div id="exportable">
     <% @tournament.weights.sort_by{|w| w.max}.each do |w| %>
         <table class='pagebreak'>
-        <td>
-            <% @weight = w %>
-            <% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %>
-            <% @wrestlers = Wrestler.where(weight_id: @weight.id) %>
-           <% @pools = w.poolRounds(@matches) %>
-            <h5><%= @weight.max %> lbs Bracket</h5>
-    
-            <%= render 'pool' %>
-        </td>
-        </table>
-        <table class='pagebreak'>
-        <td>
-            <% if w.pool_bracket_type == "twoPoolsToFinal" %>
-            	<%= render 'twoPoolFinalBracket' %>
-            <% end %>
-            <% if w.pool_bracket_type == "twoPoolsToSemi" %>
-            	<%= render 'twoPoolSemiBracket' %>
-            <% end %>
-            <% if w.pool_bracket_type == "fourPoolsToQuarter" %>
-            	<%= render 'fourPoolQuarterBracket' %>
-            <% end %>
-            <% if w.pool_bracket_type == "fourPoolsToSemi" %>
-            	<%= render 'fourPoolSemiBracket' %>
-            <% end %>
-        </td>
+        <h5><strong><%= @tournament.name %> - <%= w.max %> lbs Bracket</strong></h5>
+        <tr>
+            <td valign="top" style="padding: 10px;">
+                <% @weight = w %>
+                <% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %>
+                <% @wrestlers = Wrestler.where(weight_id: @weight.id) %>
+                <% @pools = w.poolRounds(@matches) %>
+                <%= render 'pool' %>
+            </td>
+            
+            
+            <td valign="top" style="padding: 10px;">
+                <% if w.pool_bracket_type == "twoPoolsToFinal" %>
+                	<%= render 'twoPoolFinalBracket' %>
+                <% end %>
+                <% if w.pool_bracket_type == "twoPoolsToSemi" %>
+                	<%= render 'twoPoolSemiBracket' %>
+                <% end %>
+                <% if w.pool_bracket_type == "fourPoolsToQuarter" %>
+                	<%= render 'fourPoolQuarterBracket' %>
+                <% end %>
+                <% if w.pool_bracket_type == "fourPoolsToSemi" %>
+                	<%= render 'fourPoolSemiBracket' %>
+                <% end %>
+            </td>
+        </tr>
         </table>
     <% end %>
     </div>
diff --git a/app/views/tournaments/bracket.html.erb b/app/views/tournaments/bracket.html.erb
index 3b476f2..1ee6a27 100644
--- a/app/views/tournaments/bracket.html.erb
+++ b/app/views/tournaments/bracket.html.erb
@@ -1,5 +1,57 @@
+<style>
+/*
+ *  Bracket Layout Specifics
+*/
+main {
+  display:flex;
+}
 
-<% cache ["brackets", @weight] do %>
+.round {
+  display:flex;
+  flex-direction:column;
+  width: 100px;
+  list-style:none;
+  padding:0;
+}
+
+.game + li {
+  flex-grow:1;
+}
+
+li:first-child,li:last-child {
+  flex-grow:.5;
+}
+
+.game {
+  padding-left:5px;
+}
+
+.winner {
+  font-weight:bold;
+}
+
+.game span {
+  float:right;
+  margin-right:5px;
+}
+
+.game-top {
+  border-bottom:1px solid #aaa;
+}
+
+.game-top + li {
+  border-right:1px solid #aaa; min-height:30px;
+}
+
+.bracket-winner {
+  border-bottom:1px solid #aaa;
+}
+
+.game-bottom {
+  border-top:1px solid #aaa;
+}
+</style>
+<% cache ["#{@weight.id}_bracket", @weight] do %>
 	</br>
 	</br>
 	</br>
@@ -7,24 +59,48 @@
 	<%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default" %>
 	<br>
 	<br>
-	<h1><%= @weight.max %> lbs Bracket</h1>
-	
-	<%= render 'pool' %>
-	
-	<% if @bracketType == "twoPoolsToFinal" %>
-		<%= render 'twoPoolFinalBracket' %>
-	<% end %>
-	<% if @bracketType == "twoPoolsToSemi" %>
-		<%= render 'twoPoolSemiBracket' %>
-	<% end %>
-	<% if @bracketType == "fourPoolsToQuarter" %>
-		<%= render 'fourPoolQuarterBracket' %>
-	<% end %>
-	<% if @bracketType == "fourPoolsToSemi" %>
-		<%= render 'fourPoolSemiBracket' %>
-	<% end %>
+	<table class='pagebreak'>
+        <h5><strong><%= @tournament.name %> - <%= @weight.max %> lbs Bracket</strong></h5>
+        <tr>
+            <td valign="top" style="padding: 10px;">
+                <% @matches = @tournament.matches.select{|m| m.weight_id == @weight.id} %>
+                <% @wrestlers = Wrestler.where(weight_id: @weight.id) %>
+                <% @pools = @weight.poolRounds(@matches) %>
+                <%= render 'pool' %>
+            </td>
+            
+            
+            <td valign="top" style="padding: 10px;">
+                <% if @weight.pool_bracket_type == "twoPoolsToFinal" %>
+                	<%= render 'twoPoolFinalBracket' %>
+                <% end %>
+                <% if @weight.pool_bracket_type == "twoPoolsToSemi" %>
+                	<%= render 'twoPoolSemiBracket' %>
+                <% end %>
+                <% if @weight.pool_bracket_type == "fourPoolsToQuarter" %>
+                	<%= render 'fourPoolQuarterBracket' %>
+                <% end %>
+                <% if @weight.pool_bracket_type == "fourPoolsToSemi" %>
+                	<%= render 'fourPoolSemiBracket' %>
+                <% end %>
+            </td>
+        </tr>
+        </table>
+<% end %>
+
+<% if can? :manage, @tournament %> 
 	<br><br>
-	<% if @weight.wrestlers.size <= 6 && @weight.allPoolMatchesFinished(1) %>
-		<%= render 'onePoolResults' %>
-	<% end %>
+	<h3>Swap Bracket Position</h3>
+	  <%= form_for(Wrestler.new, url: swap_wrestlers_path(@tournament)) do |f| %>
+	      <div class="field">
+	        <%= f.label 'Wrestler 1' %><br>
+	        <%= f.collection_select :originalId, @weight.wrestlers, :id, :name %>
+	      </div>
+	      <div class="field">
+	        <%= f.label 'Wrestler 2' %><br>
+	        <%= f.collection_select :swapId, @weight.wrestlers, :id, :name %>
+	      </div>
+	      <br>
+	      <%= submit_tag "Swap", :class=>"btn btn-success"%>
+	  <% end %>  
 <% end %>
\ No newline at end of file
diff --git a/app/views/tournaments/team_scores.html.erb b/app/views/tournaments/team_scores.html.erb
index 1615566..45a264c 100644
--- a/app/views/tournaments/team_scores.html.erb
+++ b/app/views/tournaments/team_scores.html.erb
@@ -1,5 +1,5 @@
 
-<% cache ["team_scores", @tournament] do %>  
+<% cache ["#{@tournament.id}_team_scores", @tournament] do %>  
   <%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}" , :class=>"btn btn-default"%>
   <br>
   <br>
diff --git a/app/views/tournaments/up_matches.html.erb b/app/views/tournaments/up_matches.html.erb
index 2801883..7b880aa 100644
--- a/app/views/tournaments/up_matches.html.erb
+++ b/app/views/tournaments/up_matches.html.erb
@@ -1,7 +1,7 @@
 <% if params[:print] == nil && Rails.env.production? %>
   <script type='text/javascript' src='//eclkmpbn.com/adServe/banners?tid=85597_138467_5&type=shadowbox&size=800x440'></script>
 <% end %>
-<% cache ["up_matches", @tournament] do %>
+<% cache ["#{@tournament.id}_up_matches", @tournament] do %>
   <%= link_to "Back to #{@tournament.name}", "/tournaments/#{@tournament.id}", :class=>"btn btn-default"%>
   <script>
     // $(document).ready(function() {
diff --git a/app/views/wrestlers/_form.html.erb b/app/views/wrestlers/_form.html.erb
index bb1a141..6faa35e 100644
--- a/app/views/wrestlers/_form.html.erb
+++ b/app/views/wrestlers/_form.html.erb
@@ -52,19 +52,7 @@
   </div>
 <% end %>
 
-<% if can? :manage, @wrestler.tournament %> 
-<br><br>
-<h3>Swap Bracket Position</h3>
-  <%= form_for(Wrestler.new, url: swap_wrestlers_path(@wrestler.tournament)) do |f| %>
-      <%= f.hidden_field :originalId, :value => @wrestler.id %>
-      <div class="field">
-        <%= f.label 'Swap With' %><br>
-        <%= f.collection_select :swapId, @wrestler.weight.wrestlers, :id, :name %>
-      </div>
-      <br>
-      <%= submit_tag "Swap", :class=>"btn btn-success"%>
-  <% end %>  
-<% end %>
+
 
 
 
diff --git a/app/views/wrestlers/show.html.erb b/app/views/wrestlers/show.html.erb
index 187f0ba..4a7efb9 100644
--- a/app/views/wrestlers/show.html.erb
+++ b/app/views/wrestlers/show.html.erb
@@ -4,7 +4,7 @@
   <% if can? :manage, @school %>
     | <%= link_to "Edit #{@wrestler.name}", edit_wrestler_path(@wrestler), :class=>"btn btn-primary" %>
   <% end %>
-<% cache ["wrestlers", @wrestler] do %> 
+<% cache ["#{@wrestler.id}", @wrestler] do %> 
   <br>
   <br>
   <p>