diff --git a/app/controllers/redirect.js b/app/controllers/redirect.js
index 49ea271..9975ab2 100644
--- a/app/controllers/redirect.js
+++ b/app/controllers/redirect.js
@@ -1,16 +1,5 @@
 const { getRealEstateById } = require("../helpers/db/realEstate");
 
-const redirect = async (req, res) => {
-  const id = req.params["id"];
-  const marketAlert = await getRealEstateById(id);
-  if (marketAlert) {
-    res.redirect(marketAlert.url);
-  } else {
-    res.send("Not found");
-    res.end();
-  }
-};
-
 const getRedirect = async (req, res) => {
   const id = req.params.id || null;
   let error = false;
@@ -18,11 +7,15 @@ const getRedirect = async (req, res) => {
   if (!id) {
     error = true;
   } else {
-    const realEstate = await getRealEstateById(id);
-    if (!realEstate) {
+    try {
+      const realEstate = await getRealEstateById(id);
+      if (!realEstate) {
+        error = true;
+      } else {
+        redirectUrl = realEstate.url;
+      }
+    } catch (e) {
       error = true;
-    } else {
-      redirectUrl = realEstate.url;
     }
   }
 
diff --git a/app/controllers/unsubscribe.js b/app/controllers/unsubscribe.js
index a6c400f..95b39b2 100644
--- a/app/controllers/unsubscribe.js
+++ b/app/controllers/unsubscribe.js
@@ -3,6 +3,12 @@ const { currentSearchRequest } = require("../helpers/url");
 const getUnsubscribe = async (req, res) => {
   const title = "Uspješno ste se odjavili";
   const searchRequest = await currentSearchRequest(req);
+
+  if (!searchRequest || !searchRequest.dataValues) {
+    res.render("notFound", { title: " " });
+    return;
+  }
+
   searchRequest.subscribed = false;
   await searchRequest.save();
 
diff --git a/app/public/images/logo.png b/app/public/images/logo.png
deleted file mode 100644
index 21033de..0000000
Binary files a/app/public/images/logo.png and /dev/null differ
diff --git a/app/public/images/logo.svg b/app/public/images/logo.svg
new file mode 100644
index 0000000..77b1282
--- /dev/null
+++ b/app/public/images/logo.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="61px"
+   height="71px"
+   viewBox="0 0 61 71"
+   version="1.1"
+   id="svg16"
+   sodipodi:docname="logo.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1853"
+     inkscape:window-height="1025"
+     id="namedview18"
+     showgrid="false"
+     inkscape:zoom="9.4015324"
+     inkscape:cx="28.633994"
+     inkscape:cy="34.52803"
+     inkscape:window-x="67"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg16" />
+  <!-- Generator: Sketch 51.3 (57544) - http://www.bohemiancoding.com/sketch -->
+  <desc
+     id="desc2">Created with Sketch.</desc>
+  <defs
+     id="defs4" />
+  <g
+     style="fill:#02adba;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1"
+     id="Group-5-Copy">
+    <path
+       style="fill:#02adba;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       id="Page-1-Copy-3"
+       d="m 28.864505,0.71910556 c 0.913861,-0.49697651 2.013643,-0.49697651 2.927503,0 L 58.602992,15.299478 c 1.00074,0.544224 1.624856,1.599801 1.624856,2.748147 V 52.95707 c 0,1.148497 -0.624278,2.204188 -1.625223,2.748347 L 31.791641,70.28107 c -0.913667,0.49671 -2.013102,0.49671 -2.926768,0 L 2.053889,55.705417 C 1.052944,55.161258 0.42866553,54.105567 0.42866553,52.95707 V 18.047625 c 0,-1.148346 0.62411557,-2.203923 1.62485607,-2.748147 z M 30.328257,3.4672523 3.5172731,18.047625 V 52.95707 L 30.328257,67.532724 57.13924,52.95707 V 18.047625 Z" />
+    <path
+       style="fill:#02adba;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       transform="matrix(-1,0,0,1,38.607594,0)"
+       id="Page-1-Copy-2"
+       d="m 6.6881981,8.5296646 c 0,-1.1837877 1.2534136,-1.9364737 2.2824613,-1.3706383 L 31.113251,19.334421 c 0.496869,0.273211 0.806146,0.799054 0.806146,1.370639 v 29.035897 c 0,0.571661 -0.309358,1.097561 -0.806331,1.37074 L 8.970475,63.283151 C 7.9414326,63.848801 6.6881981,63.096106 6.6881981,61.912412 Z M 9.7768057,11.155344 V 59.287138 L 28.830789,48.813446 V 21.632428 Z" />
+    <path
+       style="fill:#02adba;fill-opacity:1"
+       inkscape:connector-curvature="0"
+       transform="rotate(4,36.513012,12.39682)"
+       id="Path-85"
+       d="m 29.442604,10.590184 12.454251,6.520214 c 0.879716,0.424975 1.970417,0.118743 2.436149,-0.683987 0.465733,-0.802729 0.130132,-1.797981 -0.749584,-2.222955 L 31.12917,7.6832415 C 30.249453,7.2582668 29.158752,7.564498 28.69302,8.367228 c -0.465732,0.8027299 -0.130132,1.797981 0.749584,2.222956 z" />
+  </g>
+  <path
+     style="fill:#02adba;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1"
+     inkscape:connector-curvature="0"
+     id="Path-87"
+     d="m 7.4817969,47.17753 c -0.71817,0.486659 -0.897559,1.451387 -0.400678,2.15478 0.496882,0.703394 1.481875,0.879093 2.200044,0.392434 L 31.118418,34.926994 c 0.939679,-0.636761 0.900745,-2.009481 -0.07358,-2.594168 L 9.2075849,19.228381 c -0.744646,-0.446859 -1.718161,-0.217874 -2.174406,0.511452 -0.456246,0.729326 -0.222451,1.682812 0.522195,2.129671 L 27.323319,33.732165 Z" />
+</svg>
diff --git a/app/public/main.css b/app/public/main.css
index aa7d733..e43255f 100644
--- a/app/public/main.css
+++ b/app/public/main.css
@@ -18,13 +18,6 @@
   left: 25%;
 }
 
-.welcome-big-logo {
-  font-size: 200pt;
-  background-image: url(./images/logo.png);
-  background-size: contain;
-  background-repeat: no-repeat;
-  color: rgba(0, 0, 0, 0);
-}
 .no-ui-slider {
   width: 95%;
 }
diff --git a/app/views/realEstateType.ejs b/app/views/realEstateType.ejs
index 6e2b6ae..e1d9f7c 100644
--- a/app/views/realEstateType.ejs
+++ b/app/views/realEstateType.ejs
@@ -4,8 +4,9 @@
     <% for(const realEstateType of realEstateTypes) { %>
 
       <a href="#" class="waves-effect collection-item"
-        id="<%= realEstateType.id %>"
-        onclick="saveAndSubmit(this.id)"
+         style="color: #02adba"
+         id="<%= realEstateType.id %>"
+         onclick="saveAndSubmit(this.id)"
       >
         <%= realEstateType.title %>
       </a>
diff --git a/app/views/unsubscribe.ejs b/app/views/unsubscribe.ejs
index d11301e..44dab4d 100644
--- a/app/views/unsubscribe.ejs
+++ b/app/views/unsubscribe.ejs
@@ -1,10 +1,12 @@
+<!--   -->
+<br><br>
 <div class="row center-align">
-    <span class="welcome-big-logo">🤙</span>
+    <img src="../assets/images/logo.svg" alt="kivi logo" width="160">
 </div>
 <div class="row">
-<div class="col s6 push-s3">
-<a href="<%= nextStep %>" class="welcome-center-button waves-effect waves-light btn">
-  Nova pretraga
-</a>
-</div>
+    <div class="col s6 push-s3">
+        <a href="<%= nextStep %>" class="welcome-center-button waves-effect waves-light btn">
+          Nova pretraga
+        </a>
+    </div>
 </div>
diff --git a/app/views/welcome.ejs b/app/views/welcome.ejs
index e1ad1ac..16b3b86 100644
--- a/app/views/welcome.ejs
+++ b/app/views/welcome.ejs
@@ -1,6 +1,7 @@
 <!--   -->
+<br><br>
 <div class="row center-align">
-    <span class="welcome-big-logo">🤙</span>
+    <img src="assets/images/logo.svg" alt="kivi logo" width="160">
 </div>
 <div class="row center-align">
   <div>Sve nekretnine dostupne u oglasima.</div>