     [:tr
       [:th "Date"]
       [:th "Comedy"]
-      [:th "Action"]
-      [:th "Drama"]
+      [:th "Action/Adventure/Sci-fi/Fantasy"]
+      [:th "Drama/Romance"]
+      [:th "Thriller/Horror"]
       [:th "Others"]]
     (for [{date           :date
            shows-by-genre :shows-by-genre} shows]
       [:tr
         [:td date]
         [:td (map render-show (:comedy shows-by-genre))]
-        [:td (map render-show (:action shows-by-genre))]
-        [:td (map render-show (:drama shows-by-genre))]
+        [:td (map render-show (:action-adventure-scifi-fantasy shows-by-genre))]
+        [:td (map render-show (:drama-romance shows-by-genre))]
+        [:td (map render-show (:thriller-horror shows-by-genre))]
         [:td (map render-show (:other shows-by-genre))]])])
 
 (defn calendar [shows]

(defroutes handler
  (GET "/" []
    (views/calendar (apply-on-whole-week retrieve-shows-by-date)))
  (GET "/execute-batch" []
    (apply-on-whole-week retrieve-and-store-shows-from-finnkino)))

(run-jetty handler {:port 8080 :join? false})


      (fn [{genres :genres}]
        (condp some genres
          #{"Komedia"} :comedy
          #{"Toiminta" "Seikkailu" "Sci-fi" "Fantasia"}
            :action-adventure-scifi-fantasy
          #{"Draama" "Romantiikka"} :drama-romance
          #{"Jännitys" "Kauhu"} :thriller-horror
          :other))
      shows)))

