diff --git a/portal/solar.py b/portal/solar.py
index b5a6d26..163f603 100644
--- a/portal/solar.py
+++ b/portal/solar.py
@@ -789,8 +789,8 @@ def send_resetpass_mail(email, config):
     body = '''
     Zahtevali ste ponastavitev gesla vašega uporabniškega računa.
 
-    Geslo lahko ponastavite na naslednji povezavi: https://zbiranje.slovenscina.eu/solar/resetpass/{}'''.format(jwt_token)
-
+    Geslo lahko ponastavite na naslednji povezavi: http://proc1.cjvt.si:5000/resetpass/{}'''.format(jwt_token)
+    logging.info(body)
     message = MIMEMultipart()
     message['From'] = config['MAIL_LOGIN']
     message['To'] = email 
diff --git a/static/css/contracts.css b/static/css/contracts.css
index 2769c6c..6fbfa67 100644
--- a/static/css/contracts.css
+++ b/static/css/contracts.css
@@ -148,7 +148,8 @@ em {
   background: white;
   width: 100%;
   padding-left: 1rem;
-  position: relative; }
+  position: relative;
+  margin-bottom: 1rem; }
   .team-item .team-item-name {
     line-height: 3.25rem; }
   .team-item .team-item-collaborations {
diff --git a/static/css/contracts.css.map b/static/css/contracts.css.map
index c23411e..3ccb354 100644
--- a/static/css/contracts.css.map
+++ b/static/css/contracts.css.map
@@ -1,6 +1,6 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
 "sources": ["slovenscina-theme.scss","slovenscina-elements.scss","contracts.scss"],
 "names": [],
 "file": "contracts.css"
diff --git a/static/css/contracts.scss b/static/css/contracts.scss
index e3a71cb..fdf8c42 100644
--- a/static/css/contracts.scss
+++ b/static/css/contracts.scss
@@ -40,6 +40,7 @@
   width:100%;
   padding-left:1rem;
   position:relative;
+  margin-bottom:1rem;
   .team-item-name {
     line-height:3.25rem;
   }
diff --git a/static/css/header.css b/static/css/header.css
index 02acbc0..a266f1a 100644
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -168,7 +168,7 @@ h1.title {
 
 p.subtitle {
   font-size: 14px;
-  line-height: 150%;
+  line-height: 150%; 
   margin-top: 0.5rem; }
 
 /*# sourceMappingURL=header.css.map */
diff --git a/templates/solar-forgotpass.html b/templates/solar-forgotpass.html
index fe0ce83..1eac752 100644
--- a/templates/solar-forgotpass.html
+++ b/templates/solar-forgotpass.html
@@ -27,8 +27,8 @@
                 </form>
                 {% with messages = get_flashed_messages() %}
                 {% if messages %}
-                <div class="alert">
-                    <img src="../static/image/alert.svg" alt="alert"/>
+                <div class="alert alert-success">
+                    <img src="../static/image/success.svg" alt="alert"/>
                     <p>{{ messages[0] }}</p>
                 </div>
                 {% endif %}
diff --git a/templates/solar-login.html b/templates/solar-login.html
index 197edd2..d61a070 100644
--- a/templates/solar-login.html
+++ b/templates/solar-login.html
@@ -21,10 +21,17 @@
             <h1 class="m-b-3">Prijava</h1>
             {% with messages = get_flashed_messages() %}
             {% if messages %}
-            <div class="alert">
-                <img src="../static/image/alert.svg" alt="alert"/>
-                <p>{{ messages[0] }}</p>
-            </div>
+                {% if "potrditev" in messages[0] or "uspešna" in messages[0] %}
+                <div class="alert alert-success">
+                    <img src="../static/image/success.svg" alt="alert"/>
+                    <p>{{ messages[0] }}</p>
+                </div>
+                {% else %}
+                <div class="alert">
+                    <img src="../static/image/alert.svg" alt="alert"/>
+                    <p>{{ messages[0] }}</p>
+                </div>
+                {% endif %}
             {% endif %}
             {% endwith %}
             <div>
diff --git a/templates/solar-oddaja.html b/templates/solar-oddaja.html
index f547438..feb2c98 100644
--- a/templates/solar-oddaja.html
+++ b/templates/solar-oddaja.html
@@ -26,7 +26,7 @@
         <div class="row">
             <div class="col-12">
                 <h1 class="title">Korpus Šolar</h1>
-                <p class="subtitle">Prosimo, določite podatke o besedilih, ki jih želite oddati, in nato naložite besedila. Če oddajate besedila, ki so nastala v različnih razredih, se razlikujejo glede učiteljskih popravkov in podobno, jih oddajte v ločenih paketih.</p>
+                <p class="subtitle" style="width:60%">Prosimo, določite podatke o besedilih, ki jih želite oddati, in nato naložite besedila. Če oddajate besedila, ki so nastala v različnih razredih, se razlikujejo glede učiteljskih popravkov in podobno, jih oddajte v ločenih paketih.</p>
 
 
                 <div class="tab-nav">
@@ -237,7 +237,7 @@
                     </div>
                 </div>
                 <div class="col-6">
-                    <p>Oddate lahko eno ali (hkrati) več besedil, ki ustrezajo izbranim podatkom. Sprejemljivi formati so: txt, doc, docx, pdf, jpg in png.</p>
+                    <p>Oddate lahko eno ali (hkrati) več besedil, ki ustrezajo izbranim podatkom. Sprejemljivi formati so: txt, csv, pdf, doc, docx, xls, xlsx, ppt, pptx, jpg, jpeg, png.</p>
                 </div>
             </div>
 
@@ -347,7 +347,7 @@
             paramName: "file", // The name that will be used to transfer the file
             maxFilesize: 1000, // MB
             timeout: 5000000, // milliseconds
-            acceptedFiles: ".txt, .csv, .pdf, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .jpg, .jpeg, .png, .mkv",
+            acceptedFiles: ".txt, .csv, .pdf, .doc, .docx, .xls, .xlsx, .ppt, .pptx, .jpg, .jpeg, .png",
             maxFiles: 20,
             previewsContainer: "#dropzone-previews",
             dictDefaultMessage: "Kliknite to polje ali povlecite datoteke vanj.",
diff --git a/templates/solar-pogodbe.html b/templates/solar-pogodbe.html
index 2d486f0..6a1726c 100644
--- a/templates/solar-pogodbe.html
+++ b/templates/solar-pogodbe.html
@@ -159,11 +159,22 @@
         {% endfor %}
             </div>
         </div>
+
+        <div class="row">
+            <div class="col-12">
+                <h2>Število oddaj na uporabnika</h2>
+            </div>
+        </div>
+        <div class="row">
+            <div class="col-6">
+                <div id="my_dataviz">
+
+                </div>
+            </div>
+        </div>
     </div>
 
-    <div id="my_dataviz">
 
-    </div>
 
     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
 
@@ -335,22 +346,29 @@
 </style>
 <script>
     // set the dimensions and margins of the graph
-    var margin = {top: 20, right: 30, bottom: 40, left: 90},
-        width = 460 - margin.left - margin.right,
-        height = 400 - margin.top - margin.bottom;
+
 
     // append the svg object to the body of the page
-    var svg = d3.select("#my_dataviz")
-        .append("svg")
-        .attr("width", width + margin.left + margin.right)
-        .attr("height", height + margin.top + margin.bottom)
-        .append("g")
-        .attr("transform",
-            "translate(" + margin.left + "," + margin.top + ")");
+
     var data;
     // Parse the Data
     d3.json("/topuploads-by-user/").then(function(jsondata) {
+        if(Object.keys(jsondata).length < 1) {
+            return;
+        }
         data = [];
+        console.log(Object.keys(jsondata).length);
+        var margin = {top: 20, right: 0, bottom: 40, left: 0};
+        var width = document.getElementById("my_dataviz").clientWidth - margin.left - margin.right;
+        var height = Object.keys(jsondata).length * 56;
+        var svg = d3.select("#my_dataviz")
+            .append("svg")
+            .attr("width", width + margin.left + margin.right)
+            .attr("height", height + margin.top + margin.bottom)
+            .style("overflow","visible")
+            .append("g")
+            .attr("transform",
+                "translate(" + margin.left + "," + margin.top + ")");
         for(var key in jsondata) {
             data.push({'name': key, 'value':jsondata[key]});
         }
@@ -366,16 +384,19 @@
             .attr("transform", "translate(0," + height + ")")
             .call(d3.axisBottom(x))
             .selectAll("text")
-            //.attr("transform", "translate(-10,0)")
             .style("text-anchor", "center");
 
         // Y axis
         var y = d3.scaleBand()
-            .range([ 0, data.length*30 ])
+            .range([ 0, data.length*56 ])
             .domain(data.map(function(d) { return d.name; }))
-            .padding(.1);
+            .padding(0);
         svg.append("g")
             .call(d3.axisLeft(y))
+            .selectAll("text")
+            .style("text-anchor", "start")
+            .style("font-size", "14px")
+            .attr("transform", "translate(8,-36)");
 
         //Bars
         svg.selectAll("myRect")
@@ -385,8 +406,9 @@
             .attr("x", x(0) )
             .attr("y", function(d) { return y(d.name); })
             .attr("width", function(d) { return x(d.value); })
-            .attr("height", 20 )
-            .attr("fill", "#006CB7")
+            .attr("height", 32 )
+            .attr("fill", "#006CB7");
+
 
 
 
diff --git a/templates/solar-register.html b/templates/solar-register.html
index 3578d04..ee8dc97 100644
--- a/templates/solar-register.html
+++ b/templates/solar-register.html
@@ -20,6 +20,14 @@
         <div class="text-center m-b-3"><em>Zbiranje besedil za korpus Šolar poteka po naslednjem postopku, ki prinaša tudi točke za napredovanje v pedagoški naziv.</em></div>
 
         <h1 class="m-b-3">Registracija</h1>
+        {% with messages = get_flashed_messages() %}
+        {% if messages %}
+        <div class="alert">
+            <img src="../static/image/alert.svg" alt="alert"/>
+            <p>{{ messages[0] }}</p>
+        </div>
+        {% endif %}
+        {% endwith %}
         <div>
             <form method="POST" action="../register" class="m-b-2">
                 <div class="input-wrapper">
@@ -64,14 +72,7 @@
                 <button class="btn" style="margin-left: 46px;">REGISTRACIJA</button>
             </form>
         </div>
-        {% with messages = get_flashed_messages() %}
-        {% if messages %}
-        <div class="alert">
-            <img src="../static/image/alert.svg" alt="alert"/>
-            <p>{{ messages[0] }}</p>
-        </div>
-        {% endif %}
-        {% endwith %}
+
         <div class="back-to-login">
             <img src="../static/image/chevron-left.svg"/>
             <a href="../login">Nazaj na prijavo</a>
diff --git a/templates/solar-zgodovina.html b/templates/solar-zgodovina.html
index 9e2e961..ffdcc58 100644
--- a/templates/solar-zgodovina.html
+++ b/templates/solar-zgodovina.html
@@ -55,23 +55,23 @@
         "PTI" : "Poklicno-tehnično izobraževanje (PTI)"
         }%}
         {% set map_subject = {
-        "slo" : "Slovenščina",
-        "drug-jez" : "Drugi jezikoslovni predmeti",
-        "drug-druz" : "Drugi družboslovni predmeti",
-        "drug-narav" : "Drugi naravoslovni predmeti",
-        "drug-strok" : "Drugi strokovni predmeti",
-        "drug-izb" : "Drugi izbirni ali dodatni predmeti",
+        "SLO" : "Slovenščina",
+        "DJP" : "Drugi jezikoslovni predmeti",
+        "DDP" : "Drugi družboslovni predmeti",
+        "DNP" : "Drugi naravoslovni predmeti",
+        "DSP" : "Drugi strokovni predmeti",
+        "DIP" : "Drugi izbirni ali dodatni predmeti",
         }%}
         {% set map_text_type = {
-        "esej-spis" : "Esej ali spis",
-        "prakticno" : "Praktično besedilo, napisano za oceno",
-        "solski-test" : "Šolski test",
-        "delo-v-razredu" : "Delo v razredu, ne za oceno",
+        "E" : "Esej ali spis",
+        "PB" : "Praktično besedilo, napisano za oceno",
+        "T" : "Šolski test",
+        "R" : "Delo v razredu, ne za oceno",
         }%}
         {% set map_grammar_corrections = {
-        "popr-ne" : "Besedilo vsebuje učiteljske popravke",
-        "brez-popr" : "Besedilo ne vsebuje učiteljskih popravkov",
-        "popr-da" : "Besedilo vsebuje učiteljske popravke in ne strinjam se z njihovo vključitvijo v korpus",
+        "DD" : "Besedilo vsebuje učiteljske popravke",
+        "N" : "Besedilo ne vsebuje učiteljskih popravkov",
+        "DN" : "Besedilo vsebuje učiteljske popravke in ne strinjam se z njihovo vključitvijo v korpus",
         }%}
 
 
@@ -113,7 +113,7 @@
                     <div class="history-item-filecount">Št. datotek: {{ item.upload_file_hashes|length }}</div>
                     <div class="history-item-chevron"><img src="../static/image/chevron-down.svg"/></div>
                     <div class="history-item-desc">
-                        {{ item_values | join(" | ") }}
+                        {{ item_values | join(" | ") |truncate(120) }}
                     </div>
                     <div class="row">
                         <div class="col-6" style="margin:0">
@@ -129,10 +129,16 @@
                                 {% for f_name in item.upload_file_names %}
                                 <div class="file-item">
                                     <div class="file-icon"><img src="../static/image/file.svg"/></div>
-                                    <a href="getuploadfile/{{item.id}}/{{item.upload_file_hashes[loop.index - 1]}}" class="file-name">{{f_name}}</a>
+                                    <a href="getuploadfile/{{item.id}}/{{item.upload_file_hashes[loop.index - 1]}}" class="file-name" {% if item.upload_file_codes != None %}download="{{item.upload_file_codes[loop.index - 1]}}.{{f_name.split('.')[1]}}"{%endif%}>
+                                        {% if item.upload_file_codes != None %}
+                                            {{item.upload_file_codes[loop.index - 1]}}.{{f_name.split('.')[1]}}
+                                        {%else%}
+                                            {{f_name}}
+                                        {% endif %}
+                                        </a>
                                     </br>
                                     {% if item.upload_file_codes != None %}
-                                    <div>{{item.upload_file_codes[loop.index - 1]}}</div>
+                                    <!--<div>{{item.upload_file_codes[loop.index - 1]}}</div>-->
                                     {% endif %}
                                 </div>
                                 {% endfor %}