diff --git a/docker-compose.yml b/docker-compose.yml
index 79ca746..d502f83 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -10,6 +10,7 @@ services:
 
   backend:
     build: .
+    image: registry.k0.hswaw.net/informatic/covid-formity
     ports:
       - 5000:5000
     volumes:
diff --git a/static/img/hsyrenka-clean.svg b/static/img/hsyrenka-clean.svg
index 0eb9e9d..73170dc 100644
--- a/static/img/hsyrenka-clean.svg
+++ b/static/img/hsyrenka-clean.svg
@@ -5,10 +5,39 @@
    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"
-   width="366.578"
-   height="394.9512"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
    id="svg2"
-   version="1.1">
+   height="182.83109"
+   width="169.88219"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   sodipodi:docname="hsyrenka-clean.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1060"
+     id="namedview53"
+     showgrid="false"
+     inkscape:zoom="0.34851627"
+     inkscape:cx="-78.441298"
+     inkscape:cy="171.12003"
+     inkscape:window-x="1920"
+     inkscape:window-y="20"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="-0.2"
+     units="px" />
   <metadata
      id="metadata57">
     <rdf:RDF>
@@ -24,145 +53,168 @@
   <defs
      id="defs4" />
   <circle
-     style="display:none;fill:none;stroke:#000000;stroke-width:5.3648243"
-     display="none"
-     cy="195.23671"
+     id="shape1"
+     r="212.59814"
      cx="183.28935"
-     r="212.59814"
-     id="shape1" />
-  <circle
-     style="display:none;fill:none;stroke:#000000;stroke-width:5.3648243"
+     cy="-16.683384"
      display="none"
-     cy="195.23671"
-     cx="672.69104"
+     style="display:none;fill:none;stroke:#000000;stroke-width:5.3648243" />
+  <circle
+     id="shape3"
      r="212.59814"
-     id="shape3" />
+     cx="672.69104"
+     cy="-16.683384"
+     display="none"
+     style="display:none;fill:none;stroke:#000000;stroke-width:5.3648243" />
   <g
-     transform="translate(-29.663088,-17.715726)"
-     id="g4181">
+     id="g4181"
+     transform="matrix(0.46342712,0,0,0.46342712,-13.746679,-8.2099478)">
     <path
-       id="shape0"
-       stroke-miterlimit="2.00000000000"
+       style="fill:none;stroke:#000000;stroke-width:5.3648243;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2"
        d="m 393.55869,212.95238 c 0,-49.67421 -20.05385,-94.6645 -52.50643,-127.31648 M 82.175058,88.388131 C 51.29984,120.79351 32.3455,164.65945 32.3455,212.95238 c 0,43.64776 15.483183,83.67826 41.256893,114.90141 M 353.884,325.90972 c 24.8247,-30.93093 39.67469,-70.21045 39.67469,-112.95734"
-       style="fill:none;stroke:#000000;stroke-width:5.3648243;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:2" />
+       stroke-miterlimit="2.00000000000"
+       id="shape0"
+       inkscape:connector-curvature="0" />
     <path
-       id="shape4"
+       style="fill:none;stroke:#000000;stroke-width:5.3648243;stroke-linecap:round;stroke-linejoin:round"
        d="m 322.48113,287.34288 c -5.42642,5.95484 -14.1944,8.30468 -16.19449,12.59707 -9.60677,20.60952 -15.82355,29.96647 -28.06041,38.72385 -10.36487,7.41743 -23.96167,15.6146 -44.62525,17.44814 -16.59617,1.47471 -27.21328,-0.62228 -42.67179,-6.49687 -6.96154,-2.64357 -24.53535,-14.18684 -28.88724,-19.95544 -5.98785,-7.93525 -11.40625,-13.09368 -14.18782,-22.96088 -3.03202,-10.74535 -5.82911,-21.15155 -6.06119,-32.54644 -0.1194,-5.8428 0.10914,-10.93008 0.71823,-17.32399 0.9365,-2.37558 2.46367,-4.64063 4.51382,-6.21526 0.20446,-0.15746 0.0599,-0.0727 0.18887,-1.88502 0.17221,-2.42251 0.9163,-3.03117 1.04492,-3.65648 0.18638,-0.90844 -0.422,-10.44102 0.52264,-14.63046 1.96799,-8.73012 4.22471,-14.94735 6.13743,-22.64064 0.10266,-0.41486 0.15474,-0.72448 0.13249,-0.87271 -5.67459,-6.6012 -8.49335,-4.31253 -9.0142,-22.23503 l 0.83196,-0.8936 c 2.8842,-1.30256 10.48362,-4.66833 13.49465,-6.52852 m 37.95986,30.0717 -2.8463,2.23931 c -6.62133,1.71862 -14.33628,-1.87866 -16.19798,-8.88259 m -29.4697,53.53267 c 2.91367,4.73449 4.99249,8.77706 8.09891,13.32381 1.31966,1.93196 6.01873,9.14347 8.62157,9.14347 1.54783,0 2.97469,-0.0545 4.24711,-0.35732 1.94165,-0.46179 12.97952,-10.20635 14.73236,-20.284 0.66256,-4.08798 3.82923,-9.29184 7.83773,-10.71053 1.06591,-0.37851 3.17637,-1.14161 4.44123,-0.52235 l 3.75883,0.79034 m 81.88378,51.92806 c -1.95769,5.87459 -8.70848,9.56893 -15.65791,11.85366 -8.50302,2.79648 -16.87749,4.34689 -25.59762,1.49741 -3.52385,-1.15221 -6.92051,-2.85705 -10.18076,-4.88136 -6.67735,-4.14704 -12.15238,-10.27296 -15.19793,-17.52687 -0.87725,-2.09093 -2.40768,-8.07 -3.45965,-11.76281 m -49.9257,-35.04921 c 0.84046,-2.43008 2.01401,-3.62317 0.0422,-5.811 m 55.24947,-61.33119 c -1.36993,-0.62728 -11.68165,-5.24943 -12.27865,-5.74771 -2.7709,-2.31153 -1.22291,-7.67149 -0.26148,-10.45027 m 53.3581,15.86761 c 4.34159,-1.93953 11.50996,-4.24667 17.53868,-8.46532 7.57656,-5.30151 13.8059,-12.96104 15.41233,-19.15874 m -1.56858,-12.54043 c -1.00534,1.64443 -7.65226,5.17494 -9.66628,6.00904 -11.41609,4.72935 -22.97419,-0.32628 -31.61166,-7.83743 -6.22631,-5.41462 -10.2769,-11.09738 -16.72048,-16.98166 -5.52151,-5.04246 -13.56274,-7.5054 -20.90022,-7.83789 -1.80674,-0.0818 -5.14663,-0.26254 -8.49712,0.14535 -3.37925,0.41168 -6.77198,1.41702 -8.61702,2.16361 -2.43357,0.9843 -5.23626,2.43387 -6.39892,3.17758 -2.05898,1.31739 -4.52767,4.15945 -6.11744,6.00874 l -2.35665,3.1965 -0.52766,3.55958 c -1.19308,2.53591 -1.51694,8.17552 -1.82869,11.23364 -0.29555,2.9055 0.0648,6.57258 0.99701,9.37028 1.57009,4.71163 6.18922,11.50587 9.99862,14.4362 2.27837,-0.48087 3.84347,-0.98854 6.07884,-1.73512 1.10345,-0.36853 1.77525,-0.54916 4.09616,-1.47758 m 13.54139,99.06226 c 2.43538,0 4.40943,1.97435 4.40943,4.40898 0,2.43613 -1.97405,4.41048 -4.40943,4.41048 -2.43493,0 -4.40882,-1.97435 -4.40882,-4.41048 0,-2.43463 1.97389,-4.40898 4.40882,-4.40898 z m 25.94738,-14.24437 c 2.43538,0 4.40942,1.97284 4.40942,4.40898 0,2.43462 -1.97404,4.40897 -4.40942,4.40897 -2.43493,0 -4.40882,-1.97435 -4.40882,-4.40897 0,-2.43614 1.97389,-4.40898 4.40882,-4.40898 z m 25.94737,-14.24588 c 2.43508,0 4.40943,1.97435 4.40943,4.40897 0,2.43614 -1.97435,4.40897 -4.40943,4.40897 -2.43493,0 -4.40927,-1.97283 -4.40927,-4.40897 0,-2.43462 1.97434,-4.40897 4.40927,-4.40897 z m -0.16791,-29.76329 c 2.43493,0 4.40897,1.97405 4.40897,4.40898 0,2.43523 -1.97404,4.40927 -4.40897,4.40927 -2.43538,0 -4.40927,-1.97404 -4.40927,-4.40927 0,-2.43493 1.97389,-4.40898 4.40927,-4.40898 z m -25.26846,-14.75476 c 2.43492,0 4.40897,1.97404 4.40897,4.40928 0,2.43507 -1.97405,4.40897 -4.40897,4.40897 -2.43539,0 -4.40928,-1.9739 -4.40928,-4.40897 0,-2.43524 1.97389,-4.40928 4.40928,-4.40928 z m -5.65188,18.96024 c -1.83838,0.22394 -3.00588,0.3873 -5.1177,2.88007 l -5.60161,9.70292 c -0.45634,0.93796 -0.5169,3.1317 -0.23665,4.04801 1.46941,2.41328 7.09372,13.0254 9.76924,12.9936 1.57569,-0.0197 13.13622,-0.0742 14.06631,-0.49056 1.4523,-0.64802 8.71938,-11.43123 8.69985,-13.24432 -0.0209,-1.95452 -2.18163,-6.14592 -4.09541,-9.2481 -1.34071,-2.17208 -2.41434,-4.45106 -3.13049,-5.63249 -0.46694,-0.7702 -1.26985,-1.01866 -1.86201,-1.03456 -3.1482,-0.0862 -11.68544,-0.0727 -12.49153,0.0254 z m -37.66158,0 c 4.76887,8.26122 6.44176,11.15794 7.63652,13.22798 0.91525,1.58447 0.70222,1.82022 0.27389,2.69429 -1.10906,1.9209 -5.05639,8.75738 -7.42333,12.85748 l 0.0344,1.74875 c 1.35221,2.80254 3.75459,6.50142 7.14731,12.37904 0.5861,1.02048 0.38094,2.55423 0.12613,2.83888 -0.53795,0.6026 -5.15693,8.98449 -5.65733,9.79906 -1.54844,2.52395 -2.0611,3.29007 -1.50967,4.79052 l 7.43378,12.87565 c 0.004,0.0121 0.4256,0.0818 1.59734,1.03259 5.11619,-0.36943 10.26358,-0.38003 15.36024,-0.77217 l 1.30604,-1.30664 c 2.11546,-2.85857 5.24383,-8.34707 6.8386,-11.11025 0.48011,-0.23619 1.70227,-1.65336 2.57528,-1.80629 4.74343,-0.83122 13.71475,0.52387 16.32728,-1.30815 0.8565,-0.60109 1.54919,-1.5928 2.13377,-2.68596 1.44079,-2.69505 2.74183,-5.45671 4.18822,-8.1457 0.95886,-1.78206 1.16039,-2.71624 4.92315,-2.62388 3.30053,0.0802 6.60892,0.23468 9.83192,0.21651 2.06792,-0.0121 3.69569,-0.36338 4.75766,-1.76541 2.11773,-2.79497 4.84442,-7.08887 6.08172,-10.19423 2.06247,-3.54141 0.73977,-6.01086 -1.23033,-8.74527 -1.98101,-2.74803 -3.49539,-4.96917 -4.9819,-8.02638 -0.75567,-1.55299 -0.55415,-2.15422 1.3342,-4.86108 0.42439,-0.60896 5.66217,-8.11087 5.73484,-9.93321 l -0.35444,-1.68455 -6.95473,-13.32775 c -0.63152,-1.09392 -0.3764,-0.96416 -1.63595,-1.17189 -4.87274,-0.80715 -9.7438,-0.52296 -14.88907,-0.55839 -1.77736,-0.0114 -1.66426,0.20273 -2.65537,-1.39325 -1.60537,-2.58618 -4.02198,-7.92313 -5.67035,-10.79153 -1.13873,-1.98177 -0.88512,-1.86413 -2.91049,-1.87715 -4.18217,-0.0288 -13.66009,-0.16972 -15.56192,0.004 l -7.36867,11.38929 c -0.68739,0.76612 -1.32981,2.8846 -4.43199,3.14124 -0.59594,0.0492 -4.59384,0.0159 -7.54794,0.0698 -1.52921,0.028 -2.94123,-0.001 -4.45076,0.0254 -0.88149,0.0156 -1.95663,0.35975 -2.45294,1.21959 -1.90455,3.30067 -5.35406,9.27398 -6.89568,11.94389 l -1.0594,1.83535 z m -10.42271,-45.19317 c 0,1.91878 -0.25224,4.94223 -2.09017,6.00919 l -2.8737,0.78369 -1.56752,-0.26148 c -3.12883,-0.24452 -3.90857,0.66255 -6.00874,-0.52221 -0.99353,-0.56096 -14.40471,-20.38755 -15.67532,-23.51335 -1.26288,-3.10581 -0.0563,-5.33846 0.78368,-8.09861 0.99505,-3.26873 4.76478,-18.76039 7.31841,-29.42292 0.45952,-1.78948 1.65231,-3.42604 3.51174,-4.82065 0.44589,-0.272532 0.85832,-0.583674 1.23169,-0.927671 l 60.0995,-8.553587 c 2.22841,3.825752 6.43858,6.330176 11.17172,6.156815 3.54686,-0.129605 6.69264,-1.739364 8.86215,-4.212597 l 0.19289,-2.728052 -0.17078,-1.698635 -2.48323,0.367465 -3.8094,0.542188 -1.14312,-1.547076 -2.28746,-3.095077 1.52209,-3.636509 0.76113,-1.818428 3.80985,-0.543188 2.29851,-0.296924 -0.18033,-1.714957 -0.8774,-2.267017 c -2.10546,-1.427609 -4.66727,-2.222722 -7.4041,-2.122809 -5.8914,0.215788 -10.67177,4.51136 -11.72299,10.069754 l -57.84777,8.232846 c -0.62865,-0.797915 -1.45321,-1.45169 -2.37906,-1.987065 -1.61006,-0.930851 -5.14027,-0.639846 -9.25263,0.544913 -1.45669,0.419549 -2.15362,2.090628 -2.61102,3.46934 l -19.70053,2.803755 c -1.94279,0.276015 -3.31157,2.097744 -3.03413,4.040902 l 0.21366,1.504077 c 0.27709,1.943157 2.09552,3.310817 4.0415,3.033737 l 18.91949,-2.692466 c 0.18214,0.482232 0.23392,0.947808 0.022,1.386131 -6.66069,13.770315 -10.90024,22.043645 -15.14444,38.548075 l 0.5145,2.12636 0.66613,2.75454 c 1.99099,3.72189 3.45119,7.58337 4.96383,11.49528 2.60122,6.72898 5.51868,13.107 8.62132,19.59418 l 0.78368,4.44107 m 170.69352,89.01929 c -1.06741,6.77093 -22.33101,14.0748 -28.42212,13.02858 -6.0911,-1.04774 -17.80183,-17.22406 -16.73138,-24.01618"
-       style="fill:none;stroke:#000000;stroke-width:5.3648243;stroke-linecap:round;stroke-linejoin:round" />
+       id="shape4"
+       inkscape:connector-curvature="0" />
     <g
-       id="_228611192"
+       style="fill:none"
        transform="translate(70.9617,10.2441)"
-       style="fill:none">
+       id="_228611192">
       <path
-         id="_227090512"
-         transform="matrix(15.1407,0,0,15.1407,251.242,51.2501)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.15606,0.440202 1.54143,0 M 0.770717,0.880405 0,1.76081"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,251.242,51.2501)"
+         id="_227090512"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227089288"
-         transform="matrix(15.1407,0,0,15.1407,229.563,32.5018)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.96348,1.149 C 1.79624,1.38899 1.38897,1.4617 1.149,1.29444 L 0.669057,0.959951 m 0,0 L 1.14902,1.29447 C 1.38899,1.46173 1.46173,1.86895 1.29447,2.10895 L 0.959951,2.58891 M 1.33809,0 0,1.91988"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,229.563,32.5018)"
+         id="_227089288"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227089528"
-         transform="matrix(15.1407,0,0,15.1407,146.467,10.1572)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.21259,0.67259 C 1.23492,0.3809 0.965553,0.0669307 0.673887,0.0446287 L 0.0905537,0 M 1.12333,1.83926 1.21259,0.67259 0.629258,0.627961 C 0.337592,0.605635 0.0226171,0.887893 0.00129705,1.16667 -0.021029,1.45833 0.248358,1.77232 0.540001,1.79463 L 1.12333,1.83925 Z"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,146.467,10.1572)"
+         id="_227089528"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227091976"
-         transform="matrix(15.1407,0,0,15.1407,174.812,13.5819)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 2.03104,0.462901 1.56811,2.15589 M 1.18457,0.231451 0.721639,1.92444 M 1.56811,2.15589 0.4395,1.84731 C 0.157312,1.77012 -0.0862618,1.55187 0.0294642,1.12866 L 0.338074,0"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,174.812,13.5819)"
+         id="_227091976"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227092168"
-         transform="matrix(15.1407,0,0,15.1407,46.1367,30.7433)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.30811,0.306798 C 1.17436,0.0466085 0.780476,-0.0797885 0.520333,0.0539335 L 0,0.321401 M 1.84305,1.34744 1.30811,0.306801 0.787781,0.574269 C 0.527615,0.707991 0.407115,1.11339 0.53494,1.36205 0.668662,1.62219 1.06255,1.74863 1.32272,1.61491 Z"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,46.1367,30.7433)"
+         id="_227092168"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227092360"
-         transform="matrix(15.1407,0,0,15.1407,13.2802,42.71)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.3848,0 2.46312,1.38482 M 0.692435,0.539098 1.77075,1.92395 M 2.46312,1.38482 1.53991,2.10368 C 1.30912,2.28339 0.98843,2.3477 0.71888,2.0015 L 0,1.07827"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,13.2802,42.71)"
+         id="_227092360"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227092552"
-         transform="matrix(15.1407,0,0,15.1407,76.9341,19.5555)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0.385907,0 V 0 C 0.109733,0.0963718 -0.070092,0.468894 0.026256,0.745091 L 0.411743,1.84988"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,76.9341,19.5555)"
+         id="_227092552"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227092744"
-         transform="matrix(15.1407,0,0,15.1407,206.407,28.3965)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0,1.40109 0.526394,1.65641 C 1.20926,1.98765 1.57841,1.19131 0.909377,0.866808 0.22649,0.535568 0.623304,-0.247342 1.29238,0.0772051 L 1.81875,0.332504"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,206.407,28.3965)"
+         id="_227092744"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227092936"
-         transform="matrix(15.1407,0,0,15.1407,118.736,10.7745)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.2983,1.70895 0.714901,1.75281 C -0.0419146,1.8097 -0.0923466,0.933415 0.64914,0.877693 1.406,0.820801 1.32489,-0.0531681 0.583379,0.00255393 L 0,0.0464103"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,118.736,10.7745)"
+         id="_227092936"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227093128"
-         transform="matrix(15.1407,0,0,15.1407,91.5573,13.248)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0.28569,1.97419 0.855589,1.84199 C 1.59495,1.67048 1.38163,0.819063 0.657299,0.987097 -0.0820816,1.15859 -0.265394,0.300231 0.458986,0.132201 L 1.02886,0"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,91.5573,13.248)"
+         id="_227093128"
+         inkscape:connector-curvature="0" />
     </g>
     <g
-       id="_226298648"
+       style="fill:none"
        transform="translate(60.9814,310.809)"
-       style="fill:none">
+       id="_226298648">
       <path
-         id="_227091232"
-         transform="matrix(15.1407,0,0,15.1407,245.625,35.1653)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0.649431,0 0.169421,0.33447 C -0.0705725,0.501705 -0.0486215,1.0449 0.191138,1.38899 0.44199,1.74899 0.932859,1.94176 1.17288,1.77452 L 1.65286,1.44008"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,245.625,35.1653)"
+         id="_227091232"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227090944"
-         transform="matrix(15.1407,0,0,15.1407,263.086,20.4133)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0,0.558131 0.816586,1.39613 1.23559,0.987825 C 1.44511,0.783684 1.44144,0.360776 1.2463,0.160521 1.04216,-0.0489549 0.628499,-0.0543379 0.419,0.149826 L 4e-7,0.558131 Z M 0.816586,1.39613 C 1.02075,1.60565 1.43439,1.61097 1.64389,1.40683 l 0.419,-0.408286"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,263.086,20.4133)"
+         id="_227090944"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227091664"
-         transform="matrix(15.1407,0,0,15.1407,39.6129,36.9225)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.38301,1.13804 C 1.54607,0.895219 1.46632,0.489278 1.22349,0.326185 L 0.737819,0 M 0.730635,2.10939 1.383,1.13804 0.897331,0.811858 C 0.654483,0.648765 0.24131,0.739263 0.0854488,0.971347 -0.0776442,1.21419 0.00211222,1.62011 0.244961,1.78321 Z"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,39.6129,36.9225)"
+         id="_227091664"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227090584"
-         transform="matrix(15.1407,0,0,15.1407,194.052,62.4657)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0.526956,1.86409 1.08501,1.68843 C 1.36404,1.6006 1.50551,1.07573 1.37958,0.67568 1.24785,0.257148 0.837087,-0.0736001 0.558058,0.0142299 L 0,0.189866 M 0.702615,2.42217 0,0.189866"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,194.052,62.4657)"
+         id="_227090584"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227091136"
-         transform="matrix(15.1407,0,0,15.1407,167.655,67.6061)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0.163853,1.90008 0.743277,1.8192 C 1.49494,1.71429 1.35839,0.847267 0.621958,0.950027 -0.129733,1.05494 -0.235817,0.183663 0.500662,0.0808793 L 1.08006,0"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,167.655,67.6061)"
+         id="_227091136"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227089504"
-         transform="matrix(15.1407,0,0,15.1407,149.517,70.3871)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0.578515,0 V 0 C 0.286006,0.00325296 -0.00322582,0.298991 2.71847e-5,0.5915 L 0.0130624,1.76154"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,149.517,70.3871)"
+         id="_227089504"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227089912"
-         transform="matrix(15.1407,0,0,15.1407,89.9708,53.0358)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.60684,0.883707 C 1.52655,1.16501 1.16498,1.36599 0.883705,1.28572 L 0.321107,1.12515 m 2.3e-5,0 0.562598,0.16057 C 1.16498,1.36599 1.36601,1.72758 1.28574,2.00886 L 1.12517,2.57143 M 0.64226,0 0,2.2503"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,89.9708,53.0358)"
+         id="_227089912"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227090056"
-         transform="matrix(15.1407,0,0,15.1407,64.4529,53.7049)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.53791,0.280911 1.00948,0.0298013 C 0.745286,-0.0957297 0.284419,0.192566 0.104407,0.57136 -0.0839141,0.967683 -0.00804214,1.48956 0.256173,1.61509 L 0.78458,1.8662"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,64.4529,53.7049)"
+         id="_227090056"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227089936"
-         transform="matrix(15.1407,0,0,15.1407,218.217,52.4575)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.30813,0.3169 C 1.17919,0.0543467 0.787661,-0.0792593 0.525084,0.0496887 L 0,0.307585 M 1.82395,1.36713 1.30813,0.316895 0.78298,0.574815 C 0.52045,0.703763 0.392578,1.1069 0.515816,1.35782 0.644788,1.62039 1.03627,1.754 1.29882,1.62505 Z"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,218.217,52.4575)"
+         id="_227089936"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227090560"
-         transform="matrix(15.1407,0,0,15.1407,13.3716,13.3716)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 1.18967,0.430116 1.61981,0.826649 C 1.83488,1.02492 1.95082,1.33072 1.65339,1.65335 L 0.860279,2.51367 M 1.58618,0 0,1.72058"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,13.3716,13.3716)"
+         id="_227090560"
+         inkscape:connector-curvature="0" />
       <path
-         id="_227093320"
-         transform="matrix(15.1407,0,0,15.1407,121.513,68.278)"
+         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round"
          d="M 0.138984,0 0.00303802,1.16215 0.5841,1.23013 C 0.874666,1.26412 1.20069,0.994752 1.23317,0.717034 1.26715,0.426514 1.01061,0.101968 0.720069,0.0679865 L 0.138983,2e-6 Z M 0.00303802,1.16215 C -0.0309659,1.45269 0.225596,1.77722 0.516139,1.81122 L 1.0972,1.87918"
-         style="fill:none;stroke:#000000;stroke-width:0.35433131;stroke-linecap:round;stroke-linejoin:round" />
+         transform="matrix(15.1407,0,0,15.1407,121.513,68.278)"
+         id="_227093320"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>
diff --git a/templates/_helpers.html b/templates/_helpers.html
index 6946689..ee36ee3 100644
--- a/templates/_helpers.html
+++ b/templates/_helpers.html
@@ -11,18 +11,18 @@ None
 {% macro format_currency_raw(amount, precision=0) -%}
 {{ ("%%.%sf" | format(precision) | format(amount/100)) }}SOG
 {%- endmacro %}
-{% macro render_field(field, prefix=None, suffix=None, layout=True, label=True) %}
+{% macro render_field(field, prefix=None, suffix=None, layout=True, label=True, split=3) %}
     {% if field.type == 'HiddenField' or field.type == 'CSRFTokenField' %}
     {{ field(**kwargs) }}
     {% else %}
         {% if layout %}
         <div class="form-group{% if field.errors %} has-error{% endif %}">
             {% if field.type == 'BooleanField' %}
-            <div class="col-md-3"></div>
+            <div class="col-md-{{ split }}"></div>
             {% elif label %}
-            {{ field.label(class_='col-md-3 control-label' + (' control-label-required' if field.flags.required else '')) }}
+            {{ field.label(class_='col-md-%s control-label' % (split,) + (' control-label-required' if field.flags.required else '')) }}
             {% endif %}
-            <div class="col-md-9">
+            <div class="col-md-{{ 12 - split }}">
         {% endif %}
 
         {{ render_field_inner(field, prefix, suffix, label=label, **kwargs) }}
diff --git a/templates/base.html b/templates/base.html
index 913e456..52c9c8a 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -52,7 +52,7 @@
 
         <div class="row">
           <hr>
-          <footer class="row"><big>made by <a href="https://wiki.hackerspace.pl/people:informatic:start">inf</a></big></footer>
+          <footer class="row text-center text-muted"><big>made by volunteers at <a href="https://hackerspace.pl/">Warsaw Hackerspace</a></big> &amp; also wash your motherfucking hands</footer>
         </div>
         </div>
 
diff --git a/templates/index.html b/templates/index.html
index d836c30..486b625 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,7 @@
 {% block content %}
 <div class="row">
 <div class="col-md-2">
-    <img src="/static/img/hsyrenka-clean.svg" alt="Warszawski Hackerspace" class="img-responsive" />
+    <img src="/static/img/hsyrenka-clean.svg" alt="Warszawski Hackerspace" class="img-responsive center-block" style="max-width: 200px"/>
 </div>
 <div class="col-md-10">
 <h1>Awaryjna produkcja przyłbic ochronnych</h1>
@@ -18,14 +18,32 @@ Jeśli nie jesteś szpitalem lub inną placówką medyczną to prosimy nie wype
 </p>
 <p>Link do wiki projektu: <a href="https://wiki.hackerspace.pl/projects:covid-19">https://wiki.hackerspace.pl/projects:covid-19</a></p>
 <p class="text-danger">DO UŻYTKU TYLKO W SYTUACJI KRYZYSOWEJ GDY NIE MA ŻADNYCH ALTERNATYW, PRODUKOWANE BEZ ATESTÓW, CERTYFIKATÓW I STERYLIZACJI</p>
-<p class="text-warning">Jeśli organizujesz jakąś podobną akcję, koniecznie się <a href="mailto:covidAThackerspaceDOTpl">z nami skontaktuj</a>, będzia łatwiej jeśli skoordynujemy działania.</p>
+<p class="text-warning">Jeśli organizujesz jakąś podobną akcję, koniecznie <a href="mailto:covidAThackerspaceDOTpl">skontaktuj się z nami</a>, będzie łatwiej jeśli skoordynujemy działania.</p>
 </div>
 </div>
 
 <form action="" method="POST" class="form-horizontal clearfix">
-  {% for field in form %}
-  {{ render_field(field) }}
-  {% endfor %}
+    {{ render_field(form.entity_info) }}
+    {{ render_field(form.full_name) }}
+    {{ render_field(form.phone_number) }}
+    {{ render_field(form.email) }}
+    {{ render_field(form.extra) }}
+    {{ render_field(form.csrf_token) }}
+    <div class="row">
+        <div class="col-md-6">
+            <div class="well well-sm">
+            <h3>Szybki do przyłbic</h3>
+            {{ render_field(form.faceshield_front_required, split=6) }}
+            {{ render_field(form.faceshield_model, split=6) }}
+            </div>
+        </div>
+        <div class="col-md-6">
+            <div class="well well-sm">
+            <h3>Pełne przyłbice</h3>
+            {{ render_field(form.faceshield_full_required, split=6) }}
+            </div>
+        </div>
+    </div>
   {{ render_submit('Wyślij') }}
 </form>
 <p class="text-muted">Wypełniając powyższy formularz wyrażasz zgodę na kontakt w sprawie produkcji