--- a/madeira/templates/band/buy.html	Wed Oct 16 21:20:03 2013 -0500
+++ b/madeira/templates/band/buy.html	Thu Oct 17 20:23:15 2013 -0500
@@ -1,11 +1,16 @@
 {% extends 'base.html' %}
+{% load core_tags %}
 {% block title %}The Madeira | Merchandise{% endblock %}
+{% block navblock %}{% navbar 'buy' %}{% endblock %}
 {% block content %}
 <h1>Madeira Merchandise</h1>
+<h2>Releases</h2>
 {% for album in albums %}
-   <h2>{{ album.title }} </h2>
+   <h3>{{ album.title }}</h3>
+   <div class="media">
    <p>
-   <img class="right" src="{{ album.photo.image.url }}" alt="{{ album.title }}" title="{{ album.title }}" />
+   <img class="media-object img-thumbnail pull-right" src="{{ album.photo.image.url }}"
+         alt="{{ album.title }}" title="{{ album.title }}" />
    </p>
    {% if album.labels %}
       <ul>
@@ -30,16 +35,19 @@
       {% endfor %}
       </ul>
    {% endif %}
-   <br clear="all" />
+   <br class="clearfix">
+   </div>
 {% endfor %}
 {% if merchandise %}
-<hr />
+<h2>Swag</h2>
 <p>Support your favorite band! We may have a Paypal based payment system coming soon. In the meantime, place your orders for t-shirts and stickers by sending an email to <a href="mailto:themadeira@themadeira.net">themadeira@themadeira.net</a>.</p>
 {% endif %}
 {% for item in merchandise %}
-   <h2>{{ item.name }}</h2>
+   <h3>{{ item.name }}</h3>
+   <div class="media">
    <p>
-      <img class="right" src="{{ item.photo.image.url }}" alt="{{ item.name }}" title="{{ item.name }}" />
+      <img class="media-object pull-right img-rounded" src="{{ item.photo.image.url }}"
+         alt="{{ item.name }}" title="{{ item.name }}" />
    </p>
    {{ item.desc|safe|linebreaks }}
    {% if item.in_stock %}
@@ -47,6 +55,7 @@
    {% else %}
       <p><strike>Price: ${{ item.price }}</strike> <strong>SOLD OUT!</strong></p>
    {% endif %}
-   <br clear="all" />
+   <br class="clearfix">
+   </div>
 {% endfor %}
 {% endblock %}

--- a/madeira/templates/email_list/subscribe_form.html	Wed Oct 16 21:20:03 2013 -0500
+++ b/madeira/templates/email_list/subscribe_form.html	Thu Oct 17 20:23:15 2013 -0500
@@ -7,8 +7,8 @@
 <p>Get on the Madeira mailing list to receive updates about upcoming shows, releases, and website updates.
 This is a low volume list. We do not share your email address with anyone.</p>
 <div class="row">
-<div class="col-md-8 col-md-offset-2">
-<fieldset><legend>Mailing List Subscription</legend>
+<div class="col-md-8">
+<fieldset><legend>Mailing List Subscription Form</legend>
    <form method="post" action="." role="form">{% csrf_token %}
       {% if form.non_field_errors %}
       <div>{{ form.non_field_errors }}</div>