diff --git a/project.clj b/project.clj
index 031c774..f3fdcbf 100644
--- a/project.clj
+++ b/project.clj
@@ -59,19 +59,15 @@
             [lein-bower "0.5.1"]
             [lein-less "1.7.5"]]
 
-  :bower-dependencies [
-                        ;; Problem with using boostrap and font-awsome from Bower: neither
-                        ;; of the distributed packages compile cleanly with less :-(
-                        ;; [bootstrap "2.3.1"]
-                        ;; [font-awesome "3.2.1"]
-                        [leaflet "0.7.3"]]
+  :bower-dependencies [[leaflet "0.7.3"]]
 
   :cucumber-feature-paths ["test/clj/features"]
 
   :hooks [leiningen.less]
 
   :uberwar
-  {:handler youyesyet.handler/app
+  {:prep-tasks ["compile" "bower" ["cljsbuild" "once" "min"]]
+   :handler youyesyet.handler/app
    :init youyesyet.handler/init
    :destroy youyesyet.handler/destroy
    :name "youyesyet.war"}
@@ -89,7 +85,7 @@
 
   :profiles
   {:uberjar {:omit-source true
-             :prep-tasks ["compile" ["cljsbuild" "once" "min"]]
+             :prep-tasks ["compile" "bower" ["cljsbuild" "once" "min"]]
              :cljsbuild
              {:builds
               {:min
@@ -136,6 +132,7 @@
                      :compiler
                      {:main "youyesyet.app"
                       :asset-path "/js/out"
+                      :externs ["react/externs/react.js" "externs.js"]
                       :output-to "target/cljsbuild/public/js/app.js"
                       :output-dir "target/cljsbuild/public/js/out"
                       :source-map true
@@ -157,6 +154,7 @@
                     {:source-paths ["src/cljc" "src/cljs" "test/cljs"]
                      :compiler
                      {:output-to "target/test.js"
+                      :externs ["react/externs/react.js" "externs.js"]
                       :main "youyesyet.doo-runner"
                       :optimizations :whitespace
                       :pretty-print true}}}}
diff --git a/resources/public/css/yyy-site.css b/resources/public/css/yyy-site.css
index 0f25301..f3b399c 100644
--- a/resources/public/css/yyy-site.css
+++ b/resources/public/css/yyy-site.css
@@ -141,12 +141,19 @@
     font-weight: bold;
   }
 
+  #nav:hover #nav-menu {
+    display: block;
+    list-style-type: none;
+    width: 100%;
+  }
+
   #nav-icon {
     padding: 0;
   }
 
   #nav-menu {
     list-style-type: none;
+    display: none;
   }
 
   #nav menu li {
diff --git a/resources/public/img/basic_button.svg b/resources/public/img/basic_button.svg
new file mode 100644
index 0000000..0a4944b
--- /dev/null
+++ b/resources/public/img/basic_button.svg
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="basic_button.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs2385">
+    <linearGradient
+       id="linearGradient3201">
+      <stop
+         style="stop-color:#fffbff;stop-opacity:1;"
+         offset="0"
+         id="stop3203" />
+      <stop
+         style="stop-color:#fffffc;stop-opacity:0.43697479;"
+         offset="1"
+         id="stop3205" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         id="stop3181"
+         offset="0.5"
+         style="stop-color:#1f2022;stop-opacity:0.3277311;" />
+      <stop
+         id="stop3179"
+         offset="1"
+         style="stop-color:#3e4044;stop-opacity:0.70588237;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2391" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3177"
+       cx="13.824846"
+       cy="37.06712"
+       fx="13.824846"
+       fy="37.06712"
+       r="25.818182"
+       gradientTransform="matrix(-2.0844779,1.8066511e-3,-1.855545e-3,-2.1408903,68.70455,103.6953)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3201"
+       id="radialGradient3207"
+       cx="54.506241"
+       cy="11.290954"
+       fx="54.506241"
+       fy="11.290954"
+       r="23.233509"
+       gradientTransform="matrix(-1.5702192,-1.55969e-2,1.5196965e-2,-1.5299634,139.92139,29.720959)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="29.960513"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="949"
+     inkscape:window-x="200"
+     inkscape:window-y="33"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2393" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2388">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#898988;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.18181818,14 C -0.48484839,4.1212121 4.6666668,-1 14.727273,-0.90909091 L 50.181818,-0.72727273 C 59.818182,-0.54545455 64.545455,4.3636364 64.909091,14 L 64.909091,49.090909 C 65,59.090909 59.69697,64 50,64.363636 L 14.727273,64 C 5.1515153,64 -7.4940054e-16,59.151515 0.18181818,49.090909 L -0.18181818,14 z"
+       id="path2395"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#radialGradient3177);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.90909091,14.181818 L 0.18181818,49.272727 C 0.42424239,59 4.8484848,64 15.090909,64.181818 L 50.727273,64.727273 C 59.424243,63.878788 62.666667,59.575758 64.818182,54 C 62.969697,57.69697 37.121212,57.212121 20,54.181818 C 15,51.575758 12.606061,49 10,43.636364 C 7.4242424,28.848485 5.7575757,4.6060608 14.818182,-0.72727264 C 4.8484848,-0.60606061 -0.75757577,4.4242423 -0.90909091,14.181818 z"
+       id="path2397"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#radialGradient3207);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       d="M 14.545455,9.0909091 C 14.149553,8.8269747 37.554919,5.8999467 44.727273,9.0909091 C 51.899626,12.281872 52.329649,12.942069 54.909091,19.090909 C 57.488533,25.239749 54.909091,49.272727 54.909091,49.272727 C 54.909091,49.272727 60.647722,31.308545 60.545455,19.090909 C 60.443186,6.8731043 56.958524,4.453501 44.545455,4.1818182 C 32.127079,3.9100192 14.545455,9.0909091 14.545455,9.0909091 z"
+       id="path3183"
+       sodipodi:nodetypes="czzczzc" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.48704529px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#f9f9f9;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="14.00945"
+       y="54.545456"
+       id="text4147"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan4149"
+         x="14.00945"
+         y="54.545456">?</tspan></text>
+  </g>
+</svg>
diff --git a/resources/public/img/female.png b/resources/public/img/female.png
deleted file mode 100644
index 567820d..0000000
Binary files a/resources/public/img/female.png and /dev/null differ
diff --git a/resources/public/img/female.xcf b/resources/public/img/female.xcf
deleted file mode 100644
index a11a6eb..0000000
Binary files a/resources/public/img/female.xcf and /dev/null differ
diff --git a/resources/public/img/gender/female.png b/resources/public/img/gender/female.png
new file mode 100644
index 0000000..24b74a7
Binary files /dev/null and b/resources/public/img/gender/female.png differ
diff --git a/resources/public/img/gender/female.xcf b/resources/public/img/gender/female.xcf
new file mode 100644
index 0000000..284a803
Binary files /dev/null and b/resources/public/img/gender/female.xcf differ
diff --git a/resources/public/img/gender/male.png b/resources/public/img/gender/male.png
new file mode 100644
index 0000000..4427edc
Binary files /dev/null and b/resources/public/img/gender/male.png differ
diff --git a/resources/public/img/gender/male.svg b/resources/public/img/gender/male.svg
new file mode 100644
index 0000000..828df16
--- /dev/null
+++ b/resources/public/img/gender/male.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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="385.05206"
+   height="988.05249"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:modified="true"
+   version="1.1"
+   sodipodi:docname="male.svg"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/male.png"
+   inkscape:export-xdpi="19.128538"
+   inkscape:export-ydpi="19.128538">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.25"
+     inkscape:cx="-3109.3322"
+     inkscape:cy="805.94824"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1920"
+     inkscape:window-height="1058"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-179.52121,-32.154841)">
+    <path
+       style="fill:#ffffff;fill-opacity:1"
+       d="m 302.07468,1018.9879 c -15.81897,-5.1904 -28.34737,-16.8655 -31.92586,-29.75162 -1.42594,-5.13478 -2.10543,-110.17978 -2.11301,-326.65896 l -0.0112,-319.09031 -8.01483,0 -8.01483,0 0,120.45053 c 0,118.07986 -0.0815,120.59391 -4.14303,127.73631 -5.26073,9.25131 -11.16854,13.58617 -22.73067,16.67855 -17.09376,4.5719 -35.7878,-4.15819 -42.50097,-19.84788 -4.3193,-10.09485 -4.038,-279.33842 0.30928,-296.02878 9.79916,-37.6215 41.53277,-68.44297 78.54331,-76.28567 19.49608,-4.1313 199.75046,-4.18226 219.18913,-0.062 19.80013,4.19692 36.80657,13.69012 51.85463,28.94588 15.47834,15.69199 22.70364,28.42132 28.09297,49.4934 3.75647,14.68761 3.96364,22.55346 3.96364,150.49169 0,116.94951 -0.41197,135.98001 -3.08199,142.37026 -4.15156,9.9361 -8.42366,14.40454 -17.95694,18.78224 -15.82006,7.2646 -35.92704,2.59108 -45.28163,-10.52495 l -4.81104,-6.74554 -0.54573,-122.72704 -0.54575,-122.72704 -7.97001,0 -7.97002,0 0,320.65745 c 0,351.50048 0.79525,328.16116 -11.62761,341.25028 -9.81312,10.3393 -19.82011,14.2505 -36.46136,14.2505 -16.64124,0 -26.64824,-3.9112 -36.46135,-14.2505 -12.18104,-12.83433 -11.62761,-2.8865 -11.62761,-209.00564 l 0,-188.41279 -8.01483,0 -8.01483,0 0,188.41279 c 0,153.54409 -0.50003,189.60605 -2.70192,194.86049 -4.03669,9.63295 -12.81825,19.13045 -22.03661,23.83335 -8.88472,4.5326 -29.05582,6.6393 -37.38936,3.905 z M 347.1449,193.72648 c -24.22231,-8.65142 -39.193,-21.98708 -49.78959,-44.35181 -5.8651,-12.37867 -6.28804,-14.75664 -6.28804,-35.35422 0,-20.841905 0.36411,-22.822531 6.47924,-35.244117 30.5436,-62.042861 118.72329,-62.194977 149.21506,-0.257406 6.31342,12.824377 6.60596,14.440919 6.60596,36.503383 0,21.21804 -0.45292,24.00705 -5.60092,34.49028 -8.64792,17.61029 -21.42101,30.45108 -38.86769,39.0737 -13.5458,6.69469 -16.9855,7.52828 -33.40502,8.0955 -13.77794,0.47595 -20.7882,-0.25485 -28.349,-2.95531 z"
+       id="path2558"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/resources/public/img/issues.png b/resources/public/img/issues.png
new file mode 100644
index 0000000..50bf308
Binary files /dev/null and b/resources/public/img/issues.png differ
diff --git a/resources/public/img/issues.svg b/resources/public/img/issues.svg
new file mode 100644
index 0000000..496b704
--- /dev/null
+++ b/resources/public/img/issues.svg
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="issues.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1">
+  <defs
+     id="defs2385">
+    <linearGradient
+       id="linearGradient3201">
+      <stop
+         style="stop-color:#fffbff;stop-opacity:1;"
+         offset="0"
+         id="stop3203" />
+      <stop
+         style="stop-color:#fffffc;stop-opacity:0.43697479;"
+         offset="1"
+         id="stop3205" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         id="stop3181"
+         offset="0.5"
+         style="stop-color:#1f2022;stop-opacity:0.3277311;" />
+      <stop
+         id="stop3179"
+         offset="1"
+         style="stop-color:#3e4044;stop-opacity:0.70588237;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2391" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3177"
+       cx="13.824846"
+       cy="37.06712"
+       fx="13.824846"
+       fy="37.06712"
+       r="25.818182"
+       gradientTransform="matrix(-2.0844779,1.8066511e-3,-1.855545e-3,-2.1408903,68.70455,103.6953)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3201"
+       id="radialGradient3207"
+       cx="54.506241"
+       cy="11.290954"
+       fx="54.506241"
+       fy="11.290954"
+       r="23.233509"
+       gradientTransform="matrix(-1.5702192,-1.55969e-2,1.5196965e-2,-1.5299634,139.92139,29.720959)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="32.687786"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="949"
+     inkscape:window-x="200"
+     inkscape:window-y="33"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2393" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4174"
+       inkscape:export-xdpi="86.849998"
+       inkscape:export-ydpi="86.849998">
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="path2395"
+         d="M -0.18181818,14 C -0.48484839,4.1212121 4.6666668,-1 14.727273,-0.90909091 L 50.181818,-0.72727273 C 59.818182,-0.54545455 64.545455,4.3636364 64.909091,14 L 64.909091,49.090909 C 65,59.090909 59.69697,64 50,64.363636 L 14.727273,64 C 5.1515153,64 -7.4940054e-16,59.151515 0.18181818,49.090909 L -0.18181818,14 z"
+         style="fill:#898988;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccccc"
+         id="path2397"
+         d="M -0.90909091,14.181818 L 0.18181818,49.272727 C 0.42424239,59 4.8484848,64 15.090909,64.181818 L 50.727273,64.727273 C 59.424243,63.878788 62.666667,59.575758 64.818182,54 C 62.969697,57.69697 37.121212,57.212121 20,54.181818 C 15,51.575758 12.606061,49 10,43.636364 C 7.4242424,28.848485 5.7575757,4.6060608 14.818182,-0.72727264 C 4.8484848,-0.60606061 -0.75757577,4.4242423 -0.90909091,14.181818 z"
+         style="fill:url(#radialGradient3177);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+      <path
+         sodipodi:nodetypes="czzczzc"
+         id="path3183"
+         d="M 14.545455,9.0909091 C 14.149553,8.8269747 37.554919,5.8999467 44.727273,9.0909091 C 51.899626,12.281872 52.329649,12.942069 54.909091,19.090909 C 57.488533,25.239749 54.909091,49.272727 54.909091,49.272727 C 54.909091,49.272727 60.647722,31.308545 60.545455,19.090909 C 60.443186,6.8731043 56.958524,4.453501 44.545455,4.1818182 C 32.127079,3.9100192 14.545455,9.0909091 14.545455,9.0909091 z"
+         style="fill:url(#radialGradient3207);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4147"
+         y="54.545456"
+         x="14.00945"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:62.48704529px;line-height:125%;font-family:'Arial Black';-inkscape-font-specification:'Arial Black, ';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#f9f9f9;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="54.545456"
+           x="14.00945"
+           id="tspan4149"
+           sodipodi:role="line">?</tspan></text>
+    </g>
+  </g>
+</svg>
diff --git a/resources/public/img/male.png b/resources/public/img/male.png
deleted file mode 100644
index 95bed88..0000000
Binary files a/resources/public/img/male.png and /dev/null differ
diff --git a/resources/public/img/male.xcf b/resources/public/img/male.xcf
deleted file mode 100644
index cf6954b..0000000
Binary files a/resources/public/img/male.xcf and /dev/null differ
diff --git a/resources/public/img/map-pins/basic_map_pin.png b/resources/public/img/map-pins/basic_map_pin.png
new file mode 100644
index 0000000..c14e0be
Binary files /dev/null and b/resources/public/img/map-pins/basic_map_pin.png differ
diff --git a/resources/public/img/map-pins/basic_map_pin.svg b/resources/public/img/map-pins/basic_map_pin.svg
new file mode 100644
index 0000000..cd8409d
--- /dev/null
+++ b/resources/public/img/map-pins/basic_map_pin.svg
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<!-- Icon created for SceneHere (c) 2010 Simon Brooke $Revision: 1.2 $ -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="240.5"
+   height="317.00851"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="basic_map_pin.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/map-pins/basic_map_pin.png"
+   inkscape:export-xdpi="11.98"
+   inkscape:export-ydpi="11.98"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3155">
+      <stop
+         style="stop-color:#ffff67;stop-opacity:1;"
+         offset="0"
+         id="stop3157" />
+      <stop
+         id="stop3163"
+         offset="1"
+         style="stop-color:#ffd200;stop-opacity:0.74789917;" />
+      <stop
+         style="stop-color:#ffff67;stop-opacity:0;"
+         offset="1"
+         id="stop3159" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3155"
+       id="radialGradient3161"
+       cx="77.050865"
+       cy="429.06537"
+       fx="77.050865"
+       fy="429.06537"
+       r="155.491"
+       gradientTransform="matrix(1,0,0,1.0302596,0,-12.983332)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-144.01361"
+     inkscape:cy="86.04423"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1031"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       originx="-384.75"
+       originy="-548.24148" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Basic pin for SceneHere</dc:title>
+        <dc:date>20100801</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (c) 2010 Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:identifier>basic_map_pin.svg</dc:identifier>
+        <dc:description>
+		Basic default map pin
+		$Revision: 1.2 $
+	</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.75,-187.11218)">
+    <path
+       style="fill:#dddddc;fill-opacity:0.70403586;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:10.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 430,192.36218 150,0 c 20,1e-5 40,20.00001 40,40 l 0,150 c 0,20.00001 -20,40.00001 -40,40 l -40,0 c -20,0 -20,46.66667 -30,70 -13.33333,-23.33333 -20,-70 -40,-70 l -40,0 c -20,10e-6 -40,-19.99999 -40,-40 l 0,-150 c 0,-19.99999 20,-39.99999 40,-40 z"
+       id="path2387"
+       sodipodi:nodetypes="cccccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:url(#radialGradient3161);fill-opacity:1;stroke:#f4f3f3;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3153"
+       sodipodi:sides="5"
+       sodipodi:cx="90"
+       sodipodi:cy="432.36218"
+       sodipodi:r1="168.77766"
+       sodipodi:r2="56.68261"
+       sodipodi:arg1="0.69157251"
+       sodipodi:arg2="1.2771074"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 220,540 106.40877,486.61778 27.802561,589.26144 43.470446,464.73376 -78.440131,421.69344 44.83438,398.11331 48.095713,268.86928 108.61567,378.82364 232.54186,341.98675 146.67073,433.52241 Z"
+       transform="matrix(0.6026863,0.1441863,-0.1441863,0.6026863,509.16002,39.357112)" />
+  </g>
+</svg>
diff --git a/resources/public/img/map-pins/mixed-pin.png b/resources/public/img/map-pins/mixed-pin.png
new file mode 100644
index 0000000..799321b
Binary files /dev/null and b/resources/public/img/map-pins/mixed-pin.png differ
diff --git a/resources/public/img/map-pins/mixed-pin.svg b/resources/public/img/map-pins/mixed-pin.svg
new file mode 100644
index 0000000..8d293e0
--- /dev/null
+++ b/resources/public/img/map-pins/mixed-pin.svg
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<!-- Icon created for SceneHere (c) 2010 Simon Brooke $Revision: 1.2 $ -->
+
+<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="240.5"
+   height="317.00851"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="mixed-pin.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/map-pins/mixed-pin.png"
+   inkscape:export-xdpi="11.98"
+   inkscape:export-ydpi="11.98"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3155">
+      <stop
+         style="stop-color:#ffff67;stop-opacity:1;"
+         offset="0"
+         id="stop3157" />
+      <stop
+         id="stop3163"
+         offset="1"
+         style="stop-color:#ffd200;stop-opacity:0.74789917;" />
+      <stop
+         style="stop-color:#ffff67;stop-opacity:0;"
+         offset="1"
+         id="stop3159" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="2.8"
+     inkscape:cx="-48.091792"
+     inkscape:cy="146.25309"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1058"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       originx="-384.75"
+       originy="-548.24148" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+        <dc:date>20100801</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (c) 2010 Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:identifier>basic_map_pin.svg</dc:identifier>
+        <dc:description>
+		Basic default map pin
+		$Revision: 1.2 $
+	</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.75,-187.11218)">
+    <path
+       style="fill:#999999;fill-opacity:0.70403586;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:10.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 430,192.36218 150,0 c 20,1e-5 40,20.00001 40,40 l 0,150 c 0,20.00001 -20,40.00001 -40,40 l -40,0 c -20,0 -20,46.66667 -30,70 -13.33333,-23.33333 -20,-70 -40,-70 l -40,0 c -20,10e-6 -40,-19.99999 -40,-40 l 0,-150 c 0,-19.99999 20,-39.99999 40,-40 z"
+       id="path2387"
+       sodipodi:nodetypes="cccccccccccc"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(4.6670821,0,0,4.6670821,353.35851,157.66476)"
+       id="g4168">
+      <rect
+         y="14"
+         x="10"
+         height="35"
+         width="45"
+         id="rect4148"
+         style="opacity:1;fill:#214478;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="14"
+         x="28"
+         height="35"
+         width="9"
+         id="rect4150"
+         style="opacity:1;fill:#fefefd;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="27.09091"
+         x="10"
+         height="8.727273"
+         width="45"
+         id="rect4152"
+         style="opacity:1;fill:#fefefd;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4154"
+         d="m 13,14 -3,0 0.09091,5.272727 42,29.818182 L 55,49 54.909091,43.818182 Z"
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 13,49.090909 -3,0 0.09091,-5.272727 L 52.09091,14 55,14.090909 54.90909,19.272727 Z"
+         id="path4160"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4156"
+         d="m 12,14 -2,0 0,4 44,31 1,0 0,-4 z"
+         style="fill:#971e1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:#971e1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 12,49 -2,0 0,-4 44,-31 1,0 0,4 z"
+         id="path4158"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="14"
+         x="30"
+         height="35"
+         width="5"
+         id="rect4162"
+         style="opacity:1;fill:#971e1f;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="29"
+         x="10"
+         height="5"
+         width="45"
+         id="rect4164"
+         style="opacity:1;fill:#971e1f;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+    </g>
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:0.99130434"
+       d="m 400,382.36217 210,-150 0,-10 -210,0 z"
+       id="path4199"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#0044aa;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 400,362.36217 195,-140 -195,0 z"
+       id="path4201"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 400,222.36217 15,0 90,65 -24.64286,17.5 -80.35714,-57.5 0,-25"
+       id="path4203"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+  </g>
+</svg>
diff --git a/resources/public/img/map-pins/no-pin.png b/resources/public/img/map-pins/no-pin.png
new file mode 100644
index 0000000..2e426ae
Binary files /dev/null and b/resources/public/img/map-pins/no-pin.png differ
diff --git a/resources/public/img/map-pins/no-pin.svg b/resources/public/img/map-pins/no-pin.svg
new file mode 100644
index 0000000..f59dc4f
--- /dev/null
+++ b/resources/public/img/map-pins/no-pin.svg
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<!-- Icon created for SceneHere (c) 2010 Simon Brooke $Revision: 1.2 $ -->
+
+<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="240.5"
+   height="317.00851"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="no-pin.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/map-pins/no-pin.png"
+   inkscape:export-xdpi="11.98"
+   inkscape:export-ydpi="11.98"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3155">
+      <stop
+         style="stop-color:#ffff67;stop-opacity:1;"
+         offset="0"
+         id="stop3157" />
+      <stop
+         id="stop3163"
+         offset="1"
+         style="stop-color:#ffd200;stop-opacity:0.74789917;" />
+      <stop
+         style="stop-color:#ffff67;stop-opacity:0;"
+         offset="1"
+         id="stop3159" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-637.97821"
+     inkscape:cy="86.04423"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1058"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       originx="-384.75"
+       originy="-548.24148" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Basic pin for SceneHere</dc:title>
+        <dc:date>20100801</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (c) 2010 Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:identifier>basic_map_pin.svg</dc:identifier>
+        <dc:description>
+		Basic default map pin
+		$Revision: 1.2 $
+	</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.75,-187.11218)">
+    <path
+       style="fill:#a02c2c;fill-opacity:0.70403586;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:10.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 430,192.36218 150,0 c 20,1e-5 40,20.00001 40,40 l 0,150 c 0,20.00001 -20,40.00001 -40,40 l -40,0 c -20,0 -20,46.66667 -30,70 -13.33333,-23.33333 -20,-70 -40,-70 l -40,0 c -20,10e-6 -40,-19.99999 -40,-40 l 0,-150 c 0,-19.99999 20,-39.99999 40,-40 z"
+       id="path2387"
+       sodipodi:nodetypes="cccccccccccc"
+       inkscape:connector-curvature="0" />
+    <g
+       transform="matrix(4.6365492,0,0,4.6365492,353.66384,158.09222)"
+       id="g4168">
+      <rect
+         y="14"
+         x="10"
+         height="35"
+         width="45"
+         id="rect4148"
+         style="opacity:1;fill:#214478;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="14"
+         x="28"
+         height="35"
+         width="9"
+         id="rect4150"
+         style="opacity:1;fill:#fefefd;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="27.09091"
+         x="10"
+         height="8.727273"
+         width="45"
+         id="rect4152"
+         style="opacity:1;fill:#fefefd;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4154"
+         d="m 13,14 -3,0 0.09091,5.272727 42,29.818182 L 55,49 54.909091,43.818182 Z"
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 13,49.090909 -3,0 0.09091,-5.272727 L 52.09091,14 55,14.090909 54.90909,19.272727 Z"
+         id="path4160"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4156"
+         d="m 12,14 -2,0 0,4 44,31 1,0 0,-4 z"
+         style="fill:#971e1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:#971e1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 12,49 -2,0 0,-4 44,-31 1,0 0,4 z"
+         id="path4158"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="14"
+         x="30"
+         height="35"
+         width="5"
+         id="rect4162"
+         style="opacity:1;fill:#971e1f;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="29"
+         x="10"
+         height="5"
+         width="45"
+         id="rect4164"
+         style="opacity:1;fill:#971e1f;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/public/img/map-pins/shadow_pin.png b/resources/public/img/map-pins/shadow_pin.png
new file mode 100644
index 0000000..07c4daa
Binary files /dev/null and b/resources/public/img/map-pins/shadow_pin.png differ
diff --git a/resources/public/img/map-pins/shadow_pin.svg b/resources/public/img/map-pins/shadow_pin.svg
new file mode 100644
index 0000000..595d104
--- /dev/null
+++ b/resources/public/img/map-pins/shadow_pin.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<!-- Icon created for SceneHere (c) 2010 Simon Brooke $Revision: 1.2 $ -->
+
+<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="393.64932"
+   height="234.32486"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="shadow_pin.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/simon/workspace/scenehere/src/war/images/icons/shadow_pin.png"
+   inkscape:export-xdpi="11.98"
+   inkscape:export-ydpi="11.98"
+   version="1.1">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective2470"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <filter
+       inkscape:collect="always"
+       id="filter3286"
+       x="-0.097085193"
+       width="1.1941704"
+       y="-0.18284883"
+       height="1.3656976">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="13.632102"
+         id="feGaussianBlur3288" />
+    </filter>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="139.64551"
+     inkscape:cy="107.26322"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="949"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       originx="-309.93331"
+       originy="-527.02249" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Shadow pin for SceneHere</dc:title>
+        <dc:date>20100801</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (c) 2010 Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:identifier>shadow_pin.svg</dc:identifier>
+        <dc:description>$Revision: 1.2 $</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-309.93331,-291.01483)">
+    <path
+       style="opacity:0.66115699;fill:#373434;fill-opacity:0.52017942;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:7.35060501;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter3286)"
+       d="m 529.41369,322.3882 128.012,0.5673 c 17.06824,0.0757 19.06491,11.56969 3.99332,22.98808 l -113.037,85.63797 c -15.0716,11.4184 -47.21146,22.76115 -64.27972,22.68551 l -34.13654,-0.15128 c -17.06826,-0.0756 -52.23533,26.56729 -78.35299,39.85092 6.20469,-13.37188 35.68233,-40.04002 18.61406,-40.11566 l -34.13653,-0.15128 c -17.06826,-0.0756 -19.06494,-11.56967 -3.99332,-22.98807 l 113.03699,-85.63798 c 15.07158,-11.41838 47.21147,-22.76114 64.27973,-22.68551 z"
+       id="path2387"
+       sodipodi:nodetypes="cccccccccccc"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/resources/public/img/map-pins/unknown-pin.svg b/resources/public/img/map-pins/unknown-pin.svg
new file mode 100644
index 0000000..638daa1
--- /dev/null
+++ b/resources/public/img/map-pins/unknown-pin.svg
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<!-- Icon created for SceneHere (c) 2010 Simon Brooke $Revision: 1.2 $ -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="240.5"
+   height="317.00851"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="basic_map_pin.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/simon/workspace/scenehere/src/war/images/icons/basic_map_pin.png"
+   inkscape:export-xdpi="11.98"
+   inkscape:export-ydpi="11.98"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3155">
+      <stop
+         style="stop-color:#ffff67;stop-opacity:1;"
+         offset="0"
+         id="stop3157" />
+      <stop
+         id="stop3163"
+         offset="1"
+         style="stop-color:#ffd200;stop-opacity:0.74789917;" />
+      <stop
+         style="stop-color:#ffff67;stop-opacity:0;"
+         offset="1"
+         id="stop3159" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3155"
+       id="radialGradient3161"
+       cx="77.050865"
+       cy="429.06537"
+       fx="77.050865"
+       fy="429.06537"
+       r="155.491"
+       gradientTransform="matrix(1,0,0,1.0302596,0,-12.983332)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-144.01361"
+     inkscape:cy="86.04423"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1031"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       originx="-384.75"
+       originy="-548.24148" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Basic pin for SceneHere</dc:title>
+        <dc:date>20100801</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (c) 2010 Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:identifier>basic_map_pin.svg</dc:identifier>
+        <dc:description>
+		Basic default map pin
+		$Revision: 1.2 $
+	</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.75,-187.11218)">
+    <path
+       style="fill:#dddddc;fill-opacity:0.70403586;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:10.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 430,192.36218 150,0 c 20,1e-5 40,20.00001 40,40 l 0,150 c 0,20.00001 -20,40.00001 -40,40 l -40,0 c -20,0 -20,46.66667 -30,70 -13.33333,-23.33333 -20,-70 -40,-70 l -40,0 c -20,10e-6 -40,-19.99999 -40,-40 l 0,-150 c 0,-19.99999 20,-39.99999 40,-40 z"
+       id="path2387"
+       sodipodi:nodetypes="cccccccccccc"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:type="star"
+       style="fill:url(#radialGradient3161);fill-opacity:1;stroke:#f4f3f3;stroke-width:0;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path3153"
+       sodipodi:sides="5"
+       sodipodi:cx="90"
+       sodipodi:cy="432.36218"
+       sodipodi:r1="168.77766"
+       sodipodi:r2="56.68261"
+       sodipodi:arg1="0.69157251"
+       sodipodi:arg2="1.2771074"
+       inkscape:flatsided="false"
+       inkscape:rounded="0"
+       inkscape:randomized="0"
+       d="M 220,540 106.40877,486.61778 27.802561,589.26144 43.470446,464.73376 -78.440131,421.69344 44.83438,398.11331 48.095713,268.86928 108.61567,378.82364 232.54186,341.98675 146.67073,433.52241 Z"
+       transform="matrix(0.6026863,0.1441863,-0.1441863,0.6026863,509.16002,39.357112)" />
+  </g>
+</svg>
diff --git a/resources/public/img/map-pins/yes-pin.png b/resources/public/img/map-pins/yes-pin.png
new file mode 100644
index 0000000..68a76bd
Binary files /dev/null and b/resources/public/img/map-pins/yes-pin.png differ
diff --git a/resources/public/img/map-pins/yes-pin.svg b/resources/public/img/map-pins/yes-pin.svg
new file mode 100644
index 0000000..182e9b0
--- /dev/null
+++ b/resources/public/img/map-pins/yes-pin.svg
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<!-- Icon created for SceneHere (c) 2010 Simon Brooke $Revision: 1.2 $ -->
+
+<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="240.5"
+   height="317.00851"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="yes-pin.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/map-pins/yes-pin.png"
+   inkscape:export-xdpi="11.98"
+   inkscape:export-ydpi="11.98"
+   version="1.1">
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3155">
+      <stop
+         style="stop-color:#ffff67;stop-opacity:1;"
+         offset="0"
+         id="stop3157" />
+      <stop
+         id="stop3163"
+         offset="1"
+         style="stop-color:#ffd200;stop-opacity:0.74789917;" />
+      <stop
+         style="stop-color:#ffff67;stop-opacity:0;"
+         offset="1"
+         id="stop3159" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.98994949"
+     inkscape:cx="-390.99591"
+     inkscape:cy="86.04423"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1031"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2383"
+       originx="-384.75"
+       originy="-548.24148" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title>Basic pin for SceneHere</dc:title>
+        <dc:date>20100801</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:rights>
+          <cc:Agent>
+            <dc:title>Copyright (c) 2010 Simon Brooke</dc:title>
+          </cc:Agent>
+        </dc:rights>
+        <dc:identifier>basic_map_pin.svg</dc:identifier>
+        <dc:description>
+		Basic default map pin
+		$Revision: 1.2 $
+	</dc:description>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-384.75,-187.11218)">
+    <path
+       style="fill:#3771c8;fill-opacity:0.70403586;fill-rule:evenodd;stroke:#4f4f4f;stroke-width:10.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 430,192.36218 150,0 c 20,1e-5 40,20.00001 40,40 l 0,150 c 0,20.00001 -20,40.00001 -40,40 l -40,0 c -20,0 -20,46.66667 -30,70 -13.33333,-23.33333 -20,-70 -40,-70 l -40,0 c -20,10e-6 -40,-19.99999 -40,-40 l 0,-150 c 0,-19.99999 20,-39.99999 40,-40 z"
+       id="path2387"
+       sodipodi:nodetypes="cccccccccccc"
+       inkscape:connector-curvature="0"
+       inkscape:export-xdpi="11.98"
+       inkscape:export-ydpi="11.98" />
+    <g
+       id="g4961"
+       transform="matrix(4.6365492,0,0,4.6365492,748.94595,305.18963)">
+      <rect
+         y="-16"
+         x="-75"
+         height="35"
+         width="45"
+         id="rect4148"
+         style="opacity:1;fill:#214478;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4154"
+         d="m -72,-16 -3,0 0.09091,5.272727 42,29.818182 L -30,19 -30.09091,13.818182 Z"
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -72,19.090909 -3,0 0.09091,-5.272727 42,-29.818182 2.90909,0.09091 -0.09091,5.181818 z"
+         id="path4160"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/resources/public/img/option/no-selected.png b/resources/public/img/option/no-selected.png
new file mode 100644
index 0000000..c108d89
Binary files /dev/null and b/resources/public/img/option/no-selected.png differ
diff --git a/resources/public/img/option/no-selected.svg b/resources/public/img/option/no-selected.svg
new file mode 100644
index 0000000..c838c71
--- /dev/null
+++ b/resources/public/img/option/no-selected.svg
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="no-selected.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/option/no-unselected.png"
+   inkscape:export-xdpi="86.849998"
+   inkscape:export-ydpi="86.849998"
+   version="1.1">
+  <defs
+     id="defs2385">
+    <linearGradient
+       id="linearGradient3201">
+      <stop
+         style="stop-color:#fffbff;stop-opacity:1;"
+         offset="0"
+         id="stop3203" />
+      <stop
+         style="stop-color:#fffffc;stop-opacity:0.43697479;"
+         offset="1"
+         id="stop3205" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         id="stop3181"
+         offset="0.5"
+         style="stop-color:#1f2022;stop-opacity:0.3277311;" />
+      <stop
+         id="stop3179"
+         offset="1"
+         style="stop-color:#3e4044;stop-opacity:0.70588237;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2391" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3177"
+       cx="13.824846"
+       cy="37.06712"
+       fx="13.824846"
+       fy="37.06712"
+       r="25.818182"
+       gradientTransform="matrix(-2.0844779,1.8066511e-3,-1.855545e-3,-2.1408903,68.70455,103.6953)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3201"
+       id="radialGradient3207"
+       cx="54.506241"
+       cy="11.290954"
+       fx="54.506241"
+       fy="11.290954"
+       r="23.233509"
+       gradientTransform="matrix(-1.5702192,-1.55969e-2,1.5196965e-2,-1.5299634,139.92139,29.720959)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="11"
+     inkscape:cx="-21.670772"
+     inkscape:cy="32.267296"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1058"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2393" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#961015;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.18181818,14 C -0.48484839,4.1212121 4.6666668,-1 14.727273,-0.90909091 L 50.181818,-0.72727273 C 59.818182,-0.54545455 64.545455,4.3636364 64.909091,14 L 64.909091,49.090909 C 65,59.090909 59.69697,64 50,64.363636 L 14.727273,64 C 5.1515153,64 -7.4940054e-16,59.151515 0.18181818,49.090909 L -0.18181818,14 z"
+       id="path2395"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#radialGradient3177);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.90909091,14.181818 L 0.18181818,49.272727 C 0.42424239,59 4.8484848,64 15.090909,64.181818 L 50.727273,64.727273 C 59.424243,63.878788 62.666667,59.575758 64.818182,54 C 62.969697,57.69697 37.121212,57.212121 20,54.181818 C 15,51.575758 12.606061,49 10,43.636364 C 7.4242424,28.848485 5.7575757,4.6060608 14.818182,-0.72727264 C 4.8484848,-0.60606061 -0.75757577,4.4242423 -0.90909091,14.181818 z"
+       id="path2397"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g4168">
+      <rect
+         y="14"
+         x="10"
+         height="35"
+         width="45"
+         id="rect4148"
+         style="opacity:1;fill:#214478;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="14"
+         x="28"
+         height="35"
+         width="9"
+         id="rect4150"
+         style="opacity:1;fill:#fefefd;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="27.09091"
+         x="10"
+         height="8.727273"
+         width="45"
+         id="rect4152"
+         style="opacity:1;fill:#fefefd;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4154"
+         d="m 13,14 -3,0 0.09091,5.272727 42,29.818182 L 55,49 54.909091,43.818182 Z"
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 13,49.090909 -3,0 0.09091,-5.272727 L 52.09091,14 55,14.090909 l -0.09091,5.181818 z"
+         id="path4160"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4156"
+         d="m 12,14 -2,0 0,4 44,31 1,0 0,-4 z"
+         style="fill:#971e1f;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+      <path
+         style="fill:#971e1f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 12,49 -2,0 0,-4 44,-31 1,0 0,4 z"
+         id="path4158"
+         inkscape:connector-curvature="0" />
+      <rect
+         y="14"
+         x="30"
+         height="35"
+         width="5"
+         id="rect4162"
+         style="opacity:1;fill:#971e1f;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <rect
+         y="29"
+         x="10"
+         height="5"
+         width="45"
+         id="rect4164"
+         style="opacity:1;fill:#971e1f;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+    </g>
+    <path
+       style="fill:url(#radialGradient3207);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       d="M 14.545455,9.0909091 C 14.149553,8.8269747 37.554919,5.8999467 44.727273,9.0909091 C 51.899626,12.281872 52.329649,12.942069 54.909091,19.090909 C 57.488533,25.239749 54.909091,49.272727 54.909091,49.272727 C 54.909091,49.272727 60.647722,31.308545 60.545455,19.090909 C 60.443186,6.8731043 56.958524,4.453501 44.545455,4.1818182 C 32.127079,3.9100192 14.545455,9.0909091 14.545455,9.0909091 z"
+       id="path3183"
+       sodipodi:nodetypes="czzczzc" />
+  </g>
+</svg>
diff --git a/resources/public/img/option/no-unselected.png b/resources/public/img/option/no-unselected.png
new file mode 100644
index 0000000..119ae26
Binary files /dev/null and b/resources/public/img/option/no-unselected.png differ
diff --git a/resources/public/img/option/no-unselected.svg b/resources/public/img/option/no-unselected.svg
new file mode 100644
index 0000000..6a33b6c
--- /dev/null
+++ b/resources/public/img/option/no-unselected.svg
@@ -0,0 +1,194 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="no-unselected.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/option/no-unselected.png"
+   inkscape:export-xdpi="86.849998"
+   inkscape:export-ydpi="86.849998">
+  <defs
+     id="defs2385">
+    <linearGradient
+       id="linearGradient3201">
+      <stop
+         style="stop-color:#fffbff;stop-opacity:1;"
+         offset="0"
+         id="stop3203" />
+      <stop
+         style="stop-color:#fffffc;stop-opacity:0.43697479;"
+         offset="1"
+         id="stop3205" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         id="stop3181"
+         offset="0.5"
+         style="stop-color:#1f2022;stop-opacity:0.3277311;" />
+      <stop
+         id="stop3179"
+         offset="1"
+         style="stop-color:#3e4044;stop-opacity:0.70588237;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2391" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3177"
+       cx="13.824846"
+       cy="37.06712"
+       fx="13.824846"
+       fy="37.06712"
+       r="25.818182"
+       gradientTransform="matrix(-2.0844779,1.8066511e-3,-1.855545e-3,-2.1408903,68.70455,103.6953)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3201"
+       id="radialGradient3207"
+       cx="54.506241"
+       cy="11.290954"
+       fx="54.506241"
+       fy="11.290954"
+       r="23.233509"
+       gradientTransform="matrix(-1.5702192,-1.55969e-2,1.5196965e-2,-1.5299634,139.92139,29.720959)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-14.494032"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="949"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2393" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#898988;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.18181818,14 C -0.48484839,4.1212121 4.6666668,-1 14.727273,-0.90909091 L 50.181818,-0.72727273 C 59.818182,-0.54545455 64.545455,4.3636364 64.909091,14 L 64.909091,49.090909 C 65,59.090909 59.69697,64 50,64.363636 L 14.727273,64 C 5.1515153,64 -7.4940054e-16,59.151515 0.18181818,49.090909 L -0.18181818,14 z"
+       id="path2395"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#radialGradient3177);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.90909091,14.181818 L 0.18181818,49.272727 C 0.42424239,59 4.8484848,64 15.090909,64.181818 L 50.727273,64.727273 C 59.424243,63.878788 62.666667,59.575758 64.818182,54 C 62.969697,57.69697 37.121212,57.212121 20,54.181818 C 15,51.575758 12.606061,49 10,43.636364 C 7.4242424,28.848485 5.7575757,4.6060608 14.818182,-0.72727264 C 4.8484848,-0.60606061 -0.75757577,4.4242423 -0.90909091,14.181818 z"
+       id="path2397"
+       sodipodi:nodetypes="ccccccccc" />
+    <rect
+       style="opacity:1;fill:#333333;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158"
+       id="rect4148"
+       width="45"
+       height="35"
+       x="10.090909"
+       y="14" />
+    <rect
+       style="opacity:1;fill:#fefefd;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158"
+       id="rect4150"
+       width="9"
+       height="35"
+       x="28.09091"
+       y="14" />
+    <rect
+       style="opacity:1;fill:#fefefd;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158"
+       id="rect4152"
+       width="45"
+       height="8.727273"
+       x="10.090909"
+       y="27.09091" />
+    <path
+       style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13.090909,14 -3,0 0.09091,5.272727 42,29.818182 L 55.090909,49 55,43.818182 Z"
+       id="path4154"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0"
+       id="path4160"
+       d="m 13.090909,49.090909 -3,0 0.09091,-5.272727 42,-29.818182 2.90909,0.09091 -0.09091,5.181818 z"
+       style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       style="fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12.090909,14 -2,0 0,4 44,31 1,0 0,-4 z"
+       id="path4156"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4158"
+       d="m 12.090909,49 -2,0 0,-4 44,-31 1,0 0,4 z"
+       style="fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <rect
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158"
+       id="rect4162"
+       width="5"
+       height="35"
+       x="30.09091"
+       y="14" />
+    <rect
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158"
+       id="rect4164"
+       width="45"
+       height="5"
+       x="10.090909"
+       y="29" />
+    <path
+       style="fill:url(#radialGradient3207);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       d="M 14.545455,9.0909091 C 14.149553,8.8269747 37.554919,5.8999467 44.727273,9.0909091 C 51.899626,12.281872 52.329649,12.942069 54.909091,19.090909 C 57.488533,25.239749 54.909091,49.272727 54.909091,49.272727 C 54.909091,49.272727 60.647722,31.308545 60.545455,19.090909 C 60.443186,6.8731043 56.958524,4.453501 44.545455,4.1818182 C 32.127079,3.9100192 14.545455,9.0909091 14.545455,9.0909091 z"
+       id="path3183"
+       sodipodi:nodetypes="czzczzc" />
+  </g>
+</svg>
diff --git a/resources/public/img/option/yes-selected.png b/resources/public/img/option/yes-selected.png
new file mode 100644
index 0000000..a9fb302
Binary files /dev/null and b/resources/public/img/option/yes-selected.png differ
diff --git a/resources/public/img/option/yes-selected.svg b/resources/public/img/option/yes-selected.svg
new file mode 100644
index 0000000..d9d292e
--- /dev/null
+++ b/resources/public/img/option/yes-selected.svg
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="yes-selected.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/option/yes-selected.png"
+   inkscape:export-xdpi="86.849998"
+   inkscape:export-ydpi="86.849998"
+   version="1.1">
+  <defs
+     id="defs2385">
+    <linearGradient
+       id="linearGradient3201">
+      <stop
+         style="stop-color:#fffbff;stop-opacity:1;"
+         offset="0"
+         id="stop3203" />
+      <stop
+         style="stop-color:#fffffc;stop-opacity:0.43697479;"
+         offset="1"
+         id="stop3205" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         id="stop3181"
+         offset="0.5"
+         style="stop-color:#1f2022;stop-opacity:0.3277311;" />
+      <stop
+         id="stop3179"
+         offset="1"
+         style="stop-color:#3e4044;stop-opacity:0.70588237;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2391" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3177"
+       cx="13.824846"
+       cy="37.06712"
+       fx="13.824846"
+       fy="37.06712"
+       r="25.818182"
+       gradientTransform="matrix(-2.0844779,1.8066511e-3,-1.855545e-3,-2.1408903,68.70455,103.6953)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3201"
+       id="radialGradient3207"
+       cx="54.506241"
+       cy="11.290954"
+       fx="54.506241"
+       fy="11.290954"
+       r="23.233509"
+       gradientTransform="matrix(-1.5702192,-1.55969e-2,1.5196965e-2,-1.5299634,139.92139,29.720959)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-29.475852"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1058"
+     inkscape:window-x="1920"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2393" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#343b57;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.18181818,14 C -0.48484839,4.1212121 4.6666668,-1 14.727273,-0.90909091 L 50.181818,-0.72727273 C 59.818182,-0.54545455 64.545455,4.3636364 64.909091,14 L 64.909091,49.090909 C 65,59.090909 59.69697,64 50,64.363636 L 14.727273,64 C 5.1515153,64 -7.4940054e-16,59.151515 0.18181818,49.090909 L -0.18181818,14 z"
+       id="path2395"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#radialGradient3177);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.90909091,14.181818 L 0.18181818,49.272727 C 0.42424239,59 4.8484848,64 15.090909,64.181818 L 50.727273,64.727273 C 59.424243,63.878788 62.666667,59.575758 64.818182,54 C 62.969697,57.69697 37.121212,57.212121 20,54.181818 C 15,51.575758 12.606061,49 10,43.636364 C 7.4242424,28.848485 5.7575757,4.6060608 14.818182,-0.72727264 C 4.8484848,-0.60606061 -0.75757577,4.4242423 -0.90909091,14.181818 z"
+       id="path2397"
+       sodipodi:nodetypes="ccccccccc" />
+    <g
+       id="g4961"
+       transform="translate(85.454545,29.818182)">
+      <rect
+         y="-16"
+         x="-75"
+         height="35"
+         width="45"
+         id="rect4148"
+         style="opacity:1;fill:#214478;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4154"
+         d="m -72,-16 -3,0 0.09091,5.272727 42,29.818182 L -30,19 -30.09091,13.818182 Z"
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m -72,19.090909 -3,0 0.09091,-5.272727 42,-29.818182 2.90909,0.09091 -0.09091,5.181818 z"
+         id="path4160"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccccccc" />
+    </g>
+    <path
+       style="fill:url(#radialGradient3207);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       d="M 14.545455,9.0909091 C 14.149553,8.8269747 37.554919,5.8999467 44.727273,9.0909091 C 51.899626,12.281872 52.329649,12.942069 54.909091,19.090909 C 57.488533,25.239749 54.909091,49.272727 54.909091,49.272727 C 54.909091,49.272727 60.647722,31.308545 60.545455,19.090909 C 60.443186,6.8731043 56.958524,4.453501 44.545455,4.1818182 C 32.127079,3.9100192 14.545455,9.0909091 14.545455,9.0909091 z"
+       id="path3183"
+       sodipodi:nodetypes="czzczzc" />
+  </g>
+</svg>
diff --git a/resources/public/img/option/yes-unselected.png b/resources/public/img/option/yes-unselected.png
new file mode 100644
index 0000000..11b860c
Binary files /dev/null and b/resources/public/img/option/yes-unselected.png differ
diff --git a/resources/public/img/option/yes-unselected.svg b/resources/public/img/option/yes-unselected.svg
new file mode 100644
index 0000000..18a249c
--- /dev/null
+++ b/resources/public/img/option/yes-unselected.svg
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64px"
+   height="64px"
+   id="svg2383"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="yes-unselected.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.1"
+   inkscape:export-filename="/home/simon/workspace/youyesyet/resources/public/img/option/yes-unselected.png"
+   inkscape:export-xdpi="86.849998"
+   inkscape:export-ydpi="86.849998">
+  <defs
+     id="defs2385">
+    <linearGradient
+       id="linearGradient3201">
+      <stop
+         style="stop-color:#fffbff;stop-opacity:1;"
+         offset="0"
+         id="stop3203" />
+      <stop
+         style="stop-color:#fffffc;stop-opacity:0.43697479;"
+         offset="1"
+         id="stop3205" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3169">
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="0"
+         id="stop3171" />
+      <stop
+         id="stop3181"
+         offset="0.5"
+         style="stop-color:#1f2022;stop-opacity:0.3277311;" />
+      <stop
+         id="stop3179"
+         offset="1"
+         style="stop-color:#3e4044;stop-opacity:0.70588237;" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:persp3d-origin="32 : 21.333333 : 1"
+       id="perspective2391" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3169"
+       id="radialGradient3177"
+       cx="13.824846"
+       cy="37.06712"
+       fx="13.824846"
+       fy="37.06712"
+       r="25.818182"
+       gradientTransform="matrix(-2.0844779,1.8066511e-3,-1.855545e-3,-2.1408903,68.70455,103.6953)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3201"
+       id="radialGradient3207"
+       cx="54.506241"
+       cy="11.290954"
+       fx="54.506241"
+       fy="11.290954"
+       r="23.233509"
+       gradientTransform="matrix(-1.5702192,-1.55969e-2,1.5196965e-2,-1.5299634,139.92139,29.720959)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="5.5"
+     inkscape:cx="-14.494032"
+     inkscape:cy="32"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="949"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2393" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata2388">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:#898988;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.18181818,14 C -0.48484839,4.1212121 4.6666668,-1 14.727273,-0.90909091 L 50.181818,-0.72727273 C 59.818182,-0.54545455 64.545455,4.3636364 64.909091,14 L 64.909091,49.090909 C 65,59.090909 59.69697,64 50,64.363636 L 14.727273,64 C 5.1515153,64 -7.4940054e-16,59.151515 0.18181818,49.090909 L -0.18181818,14 z"
+       id="path2395"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#radialGradient3177);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M -0.90909091,14.181818 L 0.18181818,49.272727 C 0.42424239,59 4.8484848,64 15.090909,64.181818 L 50.727273,64.727273 C 59.424243,63.878788 62.666667,59.575758 64.818182,54 C 62.969697,57.69697 37.121212,57.212121 20,54.181818 C 15,51.575758 12.606061,49 10,43.636364 C 7.4242424,28.848485 5.7575757,4.6060608 14.818182,-0.72727264 C 4.8484848,-0.60606061 -0.75757577,4.4242423 -0.90909091,14.181818 z"
+       id="path2397"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       style="fill:url(#radialGradient3207);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
+       d="M 14.545455,9.0909091 C 14.149553,8.8269747 37.554919,5.8999467 44.727273,9.0909091 C 51.899626,12.281872 52.329649,12.942069 54.909091,19.090909 C 57.488533,25.239749 54.909091,49.272727 54.909091,49.272727 C 54.909091,49.272727 60.647722,31.308545 60.545455,19.090909 C 60.443186,6.8731043 56.958524,4.453501 44.545455,4.1818182 C 32.127079,3.9100192 14.545455,9.0909091 14.545455,9.0909091 z"
+       id="path3183"
+       sodipodi:nodetypes="czzczzc" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:1.324;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.51906158"
+       id="rect4148"
+       width="45"
+       height="35"
+       x="10"
+       y="13.818182" />
+    <path
+       style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 13,13.818182 -3,0 0.09091,5.272727 42,29.818182 L 55,48.818182 54.90909,43.636364 Z"
+       id="path4154"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccc" />
+    <path
+       sodipodi:nodetypes="ccccccc"
+       inkscape:connector-curvature="0"
+       id="path4160"
+       d="m 13,48.909091 -3,0 0.09091,-5.272727 42,-29.818182 L 55,13.909092 54.90909,19.09091 Z"
+       style="fill:#fefefd;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
diff --git a/resources/public/img/saltire-grey.png b/resources/public/img/saltire-grey.png
deleted file mode 100644
index f49aabe..0000000
Binary files a/resources/public/img/saltire-grey.png and /dev/null differ
diff --git a/resources/public/img/saltire-grey.xcf b/resources/public/img/saltire-grey.xcf
deleted file mode 100644
index 675ea86..0000000
Binary files a/resources/public/img/saltire-grey.xcf and /dev/null differ
diff --git a/resources/public/img/saltire.png b/resources/public/img/saltire.png
deleted file mode 100644
index c64e173..0000000
Binary files a/resources/public/img/saltire.png and /dev/null differ
diff --git a/resources/public/img/saltire.xcf b/resources/public/img/saltire.xcf
deleted file mode 100644
index 15b8d97..0000000
Binary files a/resources/public/img/saltire.xcf and /dev/null differ
diff --git a/resources/public/img/ujack-grey.png b/resources/public/img/ujack-grey.png
deleted file mode 100644
index b8151ed..0000000
Binary files a/resources/public/img/ujack-grey.png and /dev/null differ
diff --git a/resources/public/img/ujack-grey.xcf b/resources/public/img/ujack-grey.xcf
deleted file mode 100644
index 4ed056c..0000000
Binary files a/resources/public/img/ujack-grey.xcf and /dev/null differ
diff --git a/resources/public/img/ujack.png b/resources/public/img/ujack.png
deleted file mode 100644
index d542490..0000000
Binary files a/resources/public/img/ujack.png and /dev/null differ
diff --git a/resources/templates/app.html b/resources/templates/app.html
index f313066..5214806 100644
--- a/resources/templates/app.html
+++ b/resources/templates/app.html
@@ -37,8 +37,8 @@
     <!-- scripts and styles -->
     <!-- ATTENTION \/ -->
     <!-- Leaflet -->
-    <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.css" />
-    <script src="http://cdn.leafletjs.com/leaflet-0.7.3/leaflet.js"></script>
+    <link rel="stylesheet" href="vendor/leaflet/dist/leaflet.css" />
+    <script src="vendor/leaflet/dist/leaflet.js"></script>
     <!-- ATTENTION /\ -->
 
     <script type="text/javascript">
diff --git a/resources/templates/base-unauthenticated.html b/resources/templates/base-unauthenticated.html
index 78c3dce..3c14897 100644
--- a/resources/templates/base-unauthenticated.html
+++ b/resources/templates/base-unauthenticated.html
@@ -13,11 +13,9 @@
       <div id="nav">
         <img id="nav-icon" src="img/threelines.png" alt="Menu"/>
         <menu id="nav-menu" class="nav">
-          <li class=""><a href="index.html">Home</a></li>
-          <li class=""><a href="library.html">Library</a></li>
-          <li class=""><a href="register.html">Register</a></li>
-          <li class=""><a href="login.html">Login</a></li>
-          <li class=""><a href="about.html">About</a></li>
+          <li class=""><a href="home">Home</a></li>
+          <li class=""><a href="auth">Login</a></li>
+          <li class=""><a href="about">About</a></li>
         </menu>
       </div>
 
diff --git a/src/clj/youyesyet/routes/home.clj b/src/clj/youyesyet/routes/home.clj
index cc0ef3a..b44a289 100644
--- a/src/clj/youyesyet/routes/home.clj
+++ b/src/clj/youyesyet/routes/home.clj
@@ -11,6 +11,9 @@
 (defn app-page []
   (layout/render "app.html"))
 
+(defn about-page []
+  (layout/render "about.html"))
+
 (defn call-me-page [request]
   (if
     request
@@ -42,6 +45,8 @@
 
 (defroutes home-routes
   (GET "/" [] (home-page))
+  (GET "/home" [] (home-page))
+  (GET "/about" [] (about-page))
   (GET "/app" [] (route/restricted (app-page)))
   (GET "/call-me" [] (call-me-page nil))
   (POST "/call-me" request (call-me-page request))
diff --git a/src/cljs/youyesyet/core.cljs b/src/cljs/youyesyet/core.cljs
index 8c88872..6864752 100644
--- a/src/cljs/youyesyet/core.cljs
+++ b/src/cljs/youyesyet/core.cljs
@@ -18,10 +18,38 @@
             [youyesyet.views.followup-request :as request])
   (:import goog.History))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;
+;;;; youyesyet.core: core of the app.
+;;;;
+;;;; This program is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU General Public License
+;;;; as published by the Free Software Foundation; either version 2
+;;;; of the License, or (at your option) any later version.
+;;;;
+;;;; This program is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with this program; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+;;;; USA.
+;;;;
+;;;; Copyright (C) 2016 Simon Brooke for Radical Independence Campaign
+;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; So that we can do debug logging!
+(enable-console-print!)
 
 (defn about-page []
   (about/panel))
 
+(defn electors-page []
+  (electors/panel))
+
 (defn issues-page []
   (issues/panel))
 
@@ -36,6 +64,7 @@
 
 (def pages
   {:about #'about-page
+   :electors #'electors-page
    :issues #'issues-page
    :issue #'issue-page
    :map #'map-page
@@ -57,9 +86,15 @@
 (secretary/defroute "/about" []
   (rf/dispatch [:set-active-page :about]))
 
+(secretary/defroute "/electors" []
+  (rf/dispatch [:set-active-page :electors]))
+
 (secretary/defroute "/issues" []
   (rf/dispatch [:set-active-page :issues]))
 
+(secretary/defroute "/issues/:elector" {elector :elector}
+  (rf/dispatch (list [:set-elector elector] [:set-active-page :issues])))
+
 (secretary/defroute "/issue/:issue" {issue :issue}
   (rf/dispatch [:set-issue issue]))
 
diff --git a/src/cljs/youyesyet/db.cljs b/src/cljs/youyesyet/db.cljs
index cfc88ad..02cca2d 100644
--- a/src/cljs/youyesyet/db.cljs
+++ b/src/cljs/youyesyet/db.cljs
@@ -2,7 +2,7 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;
-;;;; youyesyet.views.electors: electors view for youyesyet.
+;;;; youyesyet.db: the state of the app.
 ;;;;
 ;;;; This program is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU General Public License
@@ -30,22 +30,30 @@
 ;;; 'client-state'.
 
 (def default-db
-  ;;; the currently displayed 'page' within the app.
-  {:page :home
-   ;;; the currently selected address, if any.
-   :address {:address "13 Imaginary Terrace, IM1 3TE"}
-   ;;; a list of the addresses in the current location at which there
-   ;;; are electors registered.
-   :addresses []
-   ;;; electors at the currently selected address
-   :electors [{:name "Alan Anderson" :gender :male :intention :no}
-              {:name "Ann Anderson" :gender :female}
-              {:name "Alex Anderson" :gender :fluid :intention :yes}
-              {:name "Andy Anderson" :intention :yes}]
-   ;;; the issues selected for the issues page on this day.
-   :issues {"Currency" "Scotland could keep the Pound, or use the Euro. But we could also set up a new currency of our own. Yada yada yada"
-            "Monarchy" "Scotland could keep the Queen. This is an issue to be decided after independence. Yada yada yada"
-            "Defence" "Scotland will not have nuclear weapons, and will probably not choose to engage in far-off wars. But we could remain members of NATO"}
-   ;;; the issue from among those issues which is currently selected.
-   :issue "Currency"
-   })
+  {;;; the currently selected address, if any.
+    :address {:id 1 :address "13 Imaginary Terrace, IM1 3TE" :latitude 55.8253043 :longitude -4.2590944}
+    ;;; a list of the addresses in the current location at which there
+    ;;; are electors registered.
+    :addresses [{:id 1 :address "13 Imaginary Terrace, IM1 3TE" :latitude 55.8253043 :longitude -4.2590944
+                 :electors [{:id 1 :name "Alan Anderson" :gender :male :intention :no}
+                            {:id 2 :name "Ann Anderson" :gender :female}
+                            {:id 3 :name "Alex Anderson" :gender :fluid :intention :yes}
+                            {:id 4 :name "Andy Anderson" :intention :yes}]}]
+    ;;; electors at the currently selected address
+    :electors [{:id 1 :name "Alan Anderson" :gender :male :intention :no}
+               {:id 2 :name "Ann Anderson" :gender :female}
+               {:id 3 :name "Alex Anderson" :gender :fluid :intention :yes}
+               {:id 4 :name "Andy Anderson" :intention :yes}]
+    ;;; the issue from among the issues which is currently selected.
+    :issue "Currency"
+    ;;; the issues selected for the issues page on this day.
+    :issues {"Currency" "Scotland could keep the Pound, or use the Euro. But we could also set up a new currency of our own. Yada yada yada"
+             "Monarchy" "Scotland could keep the Queen. This is an issue to be decided after independence. Yada yada yada"
+             "Defence" "Scotland will not have nuclear weapons, and will probably not choose to engage in far-off wars. But we could remain members of NATO"}
+    ;;; message of the day
+    :motd "This is a test version only. There is no real data."
+    ;;; the options from among which electors can select.
+    :options [{:id :yes :description "Yes"} {:id :no :description "No"}]
+    ;;; the currently displayed 'page' within the app.
+    :page :home
+    })
diff --git a/src/cljs/youyesyet/handlers.cljs b/src/cljs/youyesyet/handlers.cljs
index b6c97d7..95346e6 100644
--- a/src/cljs/youyesyet/handlers.cljs
+++ b/src/cljs/youyesyet/handlers.cljs
@@ -2,6 +2,29 @@
   (:require [youyesyet.db :as db]
             [re-frame.core :refer [dispatch reg-event-db]]))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;
+;;;; youyesyet.handlers: handlers for events.
+;;;;
+;;;; This program is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU General Public License
+;;;; as published by the Free Software Foundation; either version 2
+;;;; of the License, or (at your option) any later version.
+;;;;
+;;;; This program is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with this program; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+;;;; USA.
+;;;;
+;;;; Copyright (C) 2016 Simon Brooke for Radical Independence Campaign
+;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (reg-event-db
   :initialize-db
   (fn [_ _]
@@ -16,4 +39,3 @@
   :set-issue
   (fn [db [_ issue]]
     (assoc (assoc db :issue issue) :page :issue)))
-
diff --git a/src/cljs/youyesyet/subscriptions.cljs b/src/cljs/youyesyet/subscriptions.cljs
index fa4d351..eb392b7 100644
--- a/src/cljs/youyesyet/subscriptions.cljs
+++ b/src/cljs/youyesyet/subscriptions.cljs
@@ -1,10 +1,53 @@
 (ns youyesyet.subscriptions
   (:require [re-frame.core :refer [reg-sub]]))
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;;;
+;;;; youyesyet.views.electors: subscriptions for everything in the app state.
+;;;;
+;;;; This program is free software; you can redistribute it and/or
+;;;; modify it under the terms of the GNU General Public License
+;;;; as published by the Free Software Foundation; either version 2
+;;;; of the License, or (at your option) any later version.
+;;;;
+;;;; This program is distributed in the hope that it will be useful,
+;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;;; GNU General Public License for more details.
+;;;;
+;;;; You should have received a copy of the GNU General Public License
+;;;; along with this program; if not, write to the Free Software
+;;;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301,
+;;;; USA.
+;;;;
+;;;; Copyright (C) 2016 Simon Brooke for Radical Independence Campaign
+;;;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
 (reg-sub
-  :page
+  :motd
   (fn [db _]
-    (:page db)))
+    (:motd db)))
+
+(reg-sub
+  :address
+  (fn [db _]
+    (:address db)))
+
+(reg-sub
+  :addresses
+  (fn [db _]
+    (:addresses db)))
+
+(reg-sub
+  :electors
+  (fn [db _]
+    (:electors db)))
+
+(reg-sub
+  :issue
+  (fn [db _]
+    (:issue db)))
 
 (reg-sub
   :issues
@@ -12,6 +55,11 @@
     (:issues db)))
 
 (reg-sub
-  :issue
+  :page
   (fn [db _]
-    (:issue db)))
+    (:page db)))
+
+(reg-sub
+  :options
+  (fn [db _]
+    (:options db)))
diff --git a/src/cljs/youyesyet/ui_utils.cljs b/src/cljs/youyesyet/ui_utils.cljs
index 49066a4..862856a 100644
--- a/src/cljs/youyesyet/ui_utils.cljs
+++ b/src/cljs/youyesyet/ui_utils.cljs
@@ -32,7 +32,7 @@
 
 
 (defn big-link [text target]
-  [:div.big-link-container
+  [:div.big-link-container {:key target}
    [:a.big-link {:href target} text]])
 
 
@@ -53,5 +53,6 @@
             :on-click #(swap! collapsed? not)}]
      [:menu.nav {:id "nav-menu" :class (if @collapsed? "hidden" "shown")}
       (nav-link "#/map" "Map" :map collapsed?)
+      (nav-link "#/electors" "Electors" :electors collapsed?)
       (nav-link "#/issues" "Issues" :issues collapsed?)
       (nav-link "#/about" "About" :about collapsed?)]]))
diff --git a/src/cljs/youyesyet/views/about.cljs b/src/cljs/youyesyet/views/about.cljs
index 45ebdb4..5b46783 100644
--- a/src/cljs/youyesyet/views/about.cljs
+++ b/src/cljs/youyesyet/views/about.cljs
@@ -1,5 +1,6 @@
 (ns youyesyet.views.about
-  (:require [re-frame.core :refer [reg-sub]]
+  (:require [re-frame.core :refer [reg-sub subscribe]]
+            [markdown.core :refer [md->html]]
             [youyesyet.ui-utils :as ui]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -33,10 +34,13 @@
 (defn panel
   "Generate the about panel."
   []
+  (let [motd @(subscribe [:motd])]
   [:div
    [:h1 "You Yes Yet?"]
    [:div.container {:id "main-container"}
     [:h2 "Pre-alpha/proof of concept"]
+    [:p.motd {:dangerouslySetInnerHTML
+              {:__html (md->html motd)}}]
     [:p
      [:img {:src "img/ric-logo.png" :width "24" :height "24"}]
      " A project of the "
@@ -57,4 +61,4 @@
      [:img {:src "img/gnu.small.png" :alt "Free Software Foundation" :height "24" :width "24"}]
      " Licensed under the "
      [:a {:href "http://www.gnu.org/licenses/gpl-2.0.html"}
-      "GNU General Public License v2.0"]]]])
+      "GNU General Public License v2.0"]]]]))
diff --git a/src/cljs/youyesyet/views/electors.cljs b/src/cljs/youyesyet/views/electors.cljs
index e3d3711..e04d6fd 100644
--- a/src/cljs/youyesyet/views/electors.cljs
+++ b/src/cljs/youyesyet/views/electors.cljs
@@ -1,5 +1,6 @@
 (ns youyesyet.views.electors
-  (:require [re-frame.core :refer [reg-sub]]))
+  (:require [re-frame.core :refer [reg-sub subscribe]]
+            [youyesyet.ui-utils :as ui]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;;;
@@ -40,7 +41,76 @@
 ;;; 4. an 'issues' icon.
 ;;; The mechanics of how this panel is laid out don't matter.
 
+(defn gender-cell
+  [elector]
+  (let [gender (:gender elector)
+        image (if gender (name gender) "unknown")]
+    [:td {:key (:id elector)} (if gender [:img {:src (str "img/gender/" image ".png") :alt image}])]))
+
+(defn genders-row
+  [electors]
+  [:tr
+   (map
+     #(gender-cell %) electors)])
+
+(defn name-cell
+  [elector]
+  [:td {:key (str "name-" (:id elector))} (:name elector)])
+
+(defn names-row
+  [electors]
+  [:tr
+   (map
+     #(name-cell %) electors)])
+
+(defn options-row
+  [electors option]
+  (let [optid (:id option)
+        optname (name optid)]
+    [:tr {:key (str "options-" optid)}
+     (map
+       #(let [selected (= optid (:intention %))
+              image (if selected (str "img/option/" optname "-selected.png")
+                      (str "img/option/" optname "-unselected.png"))]
+          [:td  {:key (str "option-" optid "-" (:id %))}
+           [:a {:href (str "#/set-intention/" (:id %) "/" optid)}
+            [:img {:src image :alt optname}]]])
+       electors)]))
+
+(defn issue-cell
+  "Create an issue cell for a particular elector"
+  [elector]
+  [:td {:key (:id elector)}
+   [:a {:href (str "#/issues/" (:id elector))}
+    [:img {:src "/img/issues.png" :alt "Issues"}]]])
+
+(defn issues-row
+  [electors]
+  [:tr
+   (map
+     #(issue-cell %)
+     electors)])
+
 (defn panel
   "Generate the electors panel."
   []
-  [])
+  (let [address @(subscribe [:address])
+        electors @(subscribe [:electors])
+        options @(subscribe [:options])]
+    [:div
+     [:h1 (:address address) (count electors) " electors"]
+     [:div.container {:id "main-container"}
+      [:table
+       ;; genders row
+       (genders-row electors)
+       ;; names row
+       (names-row electors)
+       ;; options rows
+       (map
+         #(options-row electors %)
+         options)
+       ;; issues row
+       (issues-row electors)]
+      (ui/back-link)]]))
+
+
diff --git a/src/cljs/youyesyet/views/issue.cljs b/src/cljs/youyesyet/views/issue.cljs
index 2da866d..c611572 100644
--- a/src/cljs/youyesyet/views/issue.cljs
+++ b/src/cljs/youyesyet/views/issue.cljs
@@ -40,7 +40,7 @@
     [:div
      [:h1 issue]
      [:div.container {:id "main-container"}
-      (ui/back-link)
       [:div {:id "issue"}
        [:div {:id "issue-text"}
-        (issues issue)]]]]))
+        (issues issue)]]
+      (ui/back-link)]]))
diff --git a/src/cljs/youyesyet/views/map.cljs b/src/cljs/youyesyet/views/map.cljs
index 18a538b..f573a7f 100644
--- a/src/cljs/youyesyet/views/map.cljs
+++ b/src/cljs/youyesyet/views/map.cljs
@@ -1,5 +1,5 @@
 (ns youyesyet.views.map
-  (:require [re-frame.core :refer [reg-sub]]
+  (:require [re-frame.core :refer [reg-sub subscribe]]
             [reagent.core :as reagent]))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -52,27 +52,51 @@
 (def osm-url "http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png")
 (def osm-attrib "Map data &copy; <a href='http://openstreetmap.org'>OpenStreetMap</a> contributors")
 
+(defn pin-image
+  "select the name of a suitable pin image for this address"
+  [address]
+  "yes-pin")
+
+(defn add-map-pin
+  "Add a map-pin with this pin-image at this latitude and longitude
+  in this map view"
+  [latitude longitude pin-image view]
+  (let [pin
+        (.Icon js/L
+               {:iconUrl (str "img/map-pins/" pin-image ".png")
+                :shadorUrl "img/map-pins/shadow_pin.png"
+                :iconSize [32 42]
+                :shadowSize [57 24]
+                :iconAnchor [16 41]
+                :shadowAnchor [16 23]}
+               )]
+    (.addTp (.marker js/L [latitude longitude] {:icon pin})) view))
+
+
+
 
 ;; My gods mapbox is user-hostile!
 (defn map-did-mount-mapbox
-    "Did-mount function loading map tile data from MapBox (proprietary)."
+  "Did-mount function loading map tile data from MapBox (proprietary)."
   []
-  (let [map (.setView (.map js/L "map") #js [55.86 -4.25] 13)]
+  (let [view (.setView (.map js/L "map") #js [55.82 -4.25] 13)]
     ;; NEED TO REPLACE FIXME with your mapID!
     (.addTo (.tileLayer js/L "http://{s}.tiles.mapbox.com/v3/FIXME/{z}/{x}/{y}.png"
                         (clj->js {:attribution "Map data &copy; [...]"
                                   :maxZoom 18}))
-            map)))
+            view)))
 
 
 (defn map-did-mount-osm
   "Did-mount function loading map tile data from Open Street Map (open)."
   []
-  (let [map (.setView (.map js/L "map") #js [55.86 -4.25] 13)]
+  (let [view (.setView (.map js/L "map") #js [55.86 -4.25] 13)
+        addresses @(subscribe [:addresses])]
     (.addTo (.tileLayer js/L osm-url
                         (clj->js {:attribution osm-attrib
                                   :maxZoom 18}))
-            map)))
+            view)
+    (map #(add-map-pin (:latitude %) (:longitude %) (pin-image %) view) addresses)))
 
 
 (defn map-did-mount
@@ -96,4 +120,3 @@
   []
   (reagent/create-class {:reagent-render map-render
                          :component-did-mount map-did-mount}))
-