diff --git a/website/css/website.css b/website/css/website.css
index 36e306d5eb..4af35dcc72 100644
--- a/website/css/website.css
+++ b/website/css/website.css
@@ -1,3 +1,7 @@
+.container {
+	max-width: 728px !important;
+}
+
 h1, h2, h3, h4, h5 {
 	font-weight: bold;
 }
diff --git a/website/templates/html/partner_page.html b/website/templates/html/partner_page.html
index 4910d07900..37cf0b053a 100644
--- a/website/templates/html/partner_page.html
+++ b/website/templates/html/partner_page.html
@@ -9,15 +9,13 @@
 					alt="{{ partner_name }}" title="{{ partner_name }}" />
 				<br><br>
 				{%- endif %}
-				<div>
-					<address>
-						{% if partner_website -%}<p><a href="{{ partner_website }}" 
-							target="_blank">{{ partner_website }}</a></p>{%- endif %}
-						{% if partner_address -%}<p>{{ partner_address }}</p>{%- endif %}
-						{% if phone -%}<p>{{ phone }}</p>{%- endif %}
-						{% if email -%}<p><a href="mailto:{{ email }}">{{ email }}</a></p>{%- endif %}
-					</address>
-				</div>
+				<address>
+					{% if partner_website -%}<p><a href="{{ partner_website }}" 
+						target="_blank">{{ partner_website }}</a></p>{%- endif %}
+					{% if partner_address -%}<p itemprop="address">{{ partner_address }}</p>{%- endif %}
+					{% if phone -%}<p itemprop="telephone">{{ phone }}</p>{%- endif %}
+					{% if email -%}<p itemprop="email"><span class="icon-envelope"></span> {{ email }}</p>{%- endif %}
+				</address>
 			</div>
 			<div class="col col-lg-8">
 				<h3 itemprop="name" style="margin-top: 0px;">{{ partner_name }}</h3>