diff --git a/web/media/kipa.css b/web/media/kipa.css
index 340f407..def1383 100644
--- a/web/media/kipa.css
+++ b/web/media/kipa.css
@@ -500,4 +500,22 @@ td.th_erotin {
 
 .oneRowInlineForm {
 	display: flex;
-}
\ No newline at end of file
+}
+
+.login-form {
+	float:right;
+    margin-top:-4px;
+    margin-bottom:0;
+    padding-bottom:0;
+    height:18px
+}
+
+.tab-selection-box {
+	border:1px solid gray;
+	margin-bottom: 1em;
+	padding: 10px
+}
+
+.vapaakaava-input {
+	width: 100%;
+}
diff --git a/web/media/tulostaulukko.css b/web/media/tulostaulukko.css
index 4f6d016..1022be7 100644
--- a/web/media/tulostaulukko.css
+++ b/web/media/tulostaulukko.css
@@ -1,3 +1,13 @@
 .tulostaulukko-solu {
     padding-right:10px;
 }
+
+.vartiosarake-solu {
+    min-width:100px;
+}
+
+.tulostaulukko-otsikko {
+    margin:0;
+    padding:0;
+    line-height:normal;
+}
\ No newline at end of file
diff --git a/web/templates/tupa/base.html b/web/templates/tupa/base.html
index 2c10e5a..7831cae 100644
--- a/web/templates/tupa/base.html
+++ b/web/templates/tupa/base.html
@@ -51,11 +51,7 @@
                 <div id="page-title" class="capitalize">
                     <a href="/kipa/{{ kisa_nimi }}/">{{ kisa_nimi|alaviiva_pois }}</a>
                 </div>
-                <div style="float:right;
-                            margin-top:-4px;
-                            margin-bottom:0;
-                            padding-bottom:0;
-                            height:18px">{% include "tupa/login.html" %}</div>
+                <div class="login-form">{% include "tupa/login.html" %}</div>
             </div>
             <div id="breadcrumbs">
                 {% if tarkistus %}
diff --git a/web/templates/tupa/base_riisuttu.html b/web/templates/tupa/base_riisuttu.html
index c92eede..070105a 100644
--- a/web/templates/tupa/base_riisuttu.html
+++ b/web/templates/tupa/base_riisuttu.html
@@ -39,11 +39,7 @@
         <div id="wrap">
             <div id="header">
                 <div id="page-title">Uusi kisa</div>
-                <div style="float:right;
-                            margin-top:-4px;
-                            margin-bottom:0;
-                            padding-bottom:0;
-                            height:18px">{% include "tupa/login.html" %}</div>
+                <div class="login-form">{% include "tupa/login.html" %}</div>
             </div>
             <div id="breadcrumbs">
                 <a href="/kipa/">&lt;- Takaisin etusivulle</a>
diff --git a/web/templates/tupa/forms/vapaa_kaava.html b/web/templates/tupa/forms/vapaa_kaava.html
index 9d6e64b..8e75b3c 100644
--- a/web/templates/tupa/forms/vapaa_kaava.html
+++ b/web/templates/tupa/forms/vapaa_kaava.html
@@ -40,7 +40,7 @@
        name="{{ kaava.name }}"
        id="{{ kaava.id }}"
        value="{{ kaava.value }}"
-       style="width:100%" />
+       class="vapaakaava-input" />
 <br />
 <br>
 <br>
diff --git a/web/templates/tupa/heijasta.html b/web/templates/tupa/heijasta.html
index ef3ce91..a0f1200 100644
--- a/web/templates/tupa/heijasta.html
+++ b/web/templates/tupa/heijasta.html
@@ -17,10 +17,10 @@
         <table width="100%" border="0" id="tulostaulukko_otsikko">
             <tr valign="top">
                 <td width="33%">
-                    <h1 class="uppercase" style="margin:0; padding:0; line-height:normal;">{{ kisa_nimi|alaviiva_pois }}</h1>
+                    <h1 class="tulostaulukko-otsikko uppercase">{{ kisa_nimi|alaviiva_pois }}</h1>
                 </td>
                 <td width="33%" align="center">
-                    <h2 style="line-height:normal;">{{ heading }}</h2>
+                    <h2 class="tulostaulukko-otsikko">{{ heading }}</h2>
                 </td>
                 <td width="33%" align="right">&nbsp;</td>
             </tr>
@@ -52,7 +52,7 @@ <h2 style="line-height:normal;">{{ heading }}</h2>
                                     {% comment %} ylarivin eka {% endcomment %}
                                     <td width="30" align="right"></td>
                                     <td width="30" align="right" class="tulostaulukko-solu"></td>
-                                    <td style="min-width:100px;"></td>
+                                    <td class="vartiosarake-solu"></td>
                                     <td align="right" width=30 class="tulostaulukko-solu"></td>
                                 {% else %}
                                     {% comment %} ylarivi {% endcomment %}
@@ -122,7 +122,7 @@ <h2 style="line-height:normal;">{{ heading }}</h2>
                                 <b>SIJ.</b>
                             </td>
                             <td width="30" align="right" class="tulostaulukko-solu"></td>
-                            <td style="min-width:100px;">
+                            <td class="vartiosarake-solu">
                                 <b>VARTIO</b>
                             </td>
                             <td align="right" width=30 class="tulostaulukko-solu">
diff --git a/web/templates/tupa/index.html b/web/templates/tupa/index.html
index e0938e8..a4db3cb 100644
--- a/web/templates/tupa/index.html
+++ b/web/templates/tupa/index.html
@@ -14,11 +14,7 @@
                 <div id="page-title">
                     {{ kisa_nimi }} <font color=00FF00 size=3><b>{{ talletettu }}</b></font>
                 </div>
-                <div style="float:right;
-                            margin-top:-4px;
-                            margin-bottom:0;
-                            padding-bottom:0;
-                            height:18px">{% include "tupa/login.html" %}</div>
+                <div class="login-form">{% include "tupa/login.html" %}</div>
             </div>
             <div id="breadcrumbs"></div>
             <div id="main" class="clearfix">
diff --git a/web/templates/tupa/login.html b/web/templates/tupa/login.html
index 8fc8e4f..3293353 100644
--- a/web/templates/tupa/login.html
+++ b/web/templates/tupa/login.html
@@ -6,6 +6,6 @@
     <form action="/kipa/login/" name="form1" id="form1" method="post">
         <input type="text" id="uname" name="uname">
         <input type="password" id="pword" name="pword">
-        <button type="submit" class="small blue awesome" style="height:20px;">Kirjaudu »</button>
+        <button type="submit" class="small blue awesome">Kirjaudu »</button>
     </form>
 {% endif %}
diff --git a/web/templates/tupa/tulokset.html b/web/templates/tupa/tulokset.html
index b3173c3..160bd0b 100644
--- a/web/templates/tupa/tulokset.html
+++ b/web/templates/tupa/tulokset.html
@@ -14,7 +14,7 @@
     <table width="100%" border="0" id="tulostaulukko_otsikko">
         <tr valign="top">
             <td width="33%">
-                <h1 style="margin:0; padding:0;">{{ kisa_nimi|alaviiva_pois }}</h1>
+                <h1 class="tulostaulukko-otsikko">{{ kisa_nimi|alaviiva_pois }}</h1>
             </td>
             <td width="33%" align="center">
                 <h1>{{ heading }}</h1>
@@ -49,7 +49,7 @@ <h1>{{ heading }}</h1>
                                 {% comment %} ylarivin eka {% endcomment %}
                                 <td width="30" align="right"></td>
                                 <td width="30" align="right" class="tulostaulukko-solu"></td>
-                                <td style="min-width:100px;"></td>
+                                <td class="vartiosarake-solu"></td>
                                 <td align="right" width=30 class="tulostaulukko-solu"></td>
                             {% else %}
                                 {% comment %} ylarivi {% endcomment %}
@@ -119,7 +119,7 @@ <h1>{{ heading }}</h1>
                             <b>SIJ.</b>
                         </td>
                         <td width="30" align="right" class="tulostaulukko-solu"></td>
-                        <td style="min-width:100px;">
+                        <td class="vartiosarake-solu">
                             <b>VARTIO</b>
                         </td>
                         <td align="right" width=30 class="tulostaulukko-solu">
diff --git a/web/templates/tupa/tuloksetHTML.html b/web/templates/tupa/tuloksetHTML.html
index 84af259..73dd3bf 100755
--- a/web/templates/tupa/tuloksetHTML.html
+++ b/web/templates/tupa/tuloksetHTML.html
@@ -11,10 +11,10 @@
         <table width="100%" border="0" id="tulostaulukko_otsikko">
             <tr valign="top">
                 <td width="33%">
-                    <h1 class="uppercase" style="margin:0; padding:0; line-height:normal;">{{ kisa_nimi|alaviiva_pois }}</h1>
+                    <h1 class="tulostaulukko-otsikko uppercase">{{ kisa_nimi|alaviiva_pois }}</h1>
                 </td>
                 <td width="33%" align="center">
-                    <h1 style="line-height:normal;">{{ heading }}</h1>
+                    <h1 class="tulostaulukko-otsikko">{{ heading }}</h1>
                 </td>
                 <td width="33%" align="right">&nbsp;</td>
             </tr>
@@ -42,7 +42,7 @@ <h1 style="line-height:normal;">{{ heading }}</h1>
                                     {% comment %} ylarivin eka {% endcomment %}
                                     <td width="30" align="right"></td>
                                     <td width="30" align="right" class="tulostaulukko-solu"></td>
-                                    <td style="min-width:100px;"></td>
+                                    <td class="vartiosarake-solu"></td>
                                     <td align="right" width=30 class="tulostaulukko-solu"></td>
                                 {% else %}
                                     {% comment %} ylarivi {% endcomment %}
@@ -118,7 +118,7 @@ <h1 style="line-height:normal;">{{ heading }}</h1>
                                 <b>SIJ.</b>
                             </td>
                             <td width="30" align="right" class="tulostaulukko-solu"></td>
-                            <td style="min-width:100px;">
+                            <td class="vartiosarake-solu">
                                 <b>VARTIO</b>
                             </td>
                             <td align="right" width=30 class="tulostaulukko-solu">
diff --git a/web/templates/tupa/valitse.html b/web/templates/tupa/valitse.html
index d18ce86..630a1e4 100644
--- a/web/templates/tupa/valitse.html
+++ b/web/templates/tupa/valitse.html
@@ -18,7 +18,7 @@ <h1>{{ heading }}</h1>
                 {% endif %}
             {% endfor %}
         </ul>
-        <div style="border:1px solid gray; margin-bottom: 1em; padding: 10px">
+        <div class="tab-selection-box">
             {% for sarake in taulukko %}
                 <div id="sarake{{ sarake.id }}" class="tabcontent">
                     <ul id="tehtavatabs">