diff --git a/form/res-judicata/src/components/edit/Guide.vue b/form/res-judicata/src/components/edit/Guide.vue
index 6f03e79..7ec0bae 100644
--- a/form/res-judicata/src/components/edit/Guide.vue
+++ b/form/res-judicata/src/components/edit/Guide.vue
@@ -155,7 +155,7 @@
                     <h1 class="title has-text-centered">Skoro hotovo!</h1>
                     <p>Průvodce už máte skoro za sebou, stačí jen tyto formality:</p>
                     <b-field label="Název žaloby">
-                        <b-input v-model="zaloba.title"></b-input>
+                        <b-input v-model="zaloba.title" placeholder="Žaloba"></b-input>
                     </b-field>
                     <b-field label="Datum na listině">
                         <b-datepicker
@@ -185,7 +185,7 @@
                         icon-right="arrow-right"
                         class="button-right"
                         :disabled="continuedisabled"
-                        v-if="activeStep!==32"
+                        v-if="activeStep!==4"
                         @click.prevent="next.action">
                         <span>Pokračovat</span>
                     </b-button>
@@ -194,8 +194,8 @@
                         icon-pack="fas"
                         icon-right="arrow-right"
                         class="button-right"
-                        v-if="activeStep==32"
-                        @click="$parent.close()">
+                        v-if="activeStep==4"
+                        @click="emitZaloba">
                         Přejít na vypsání žaloby
                     </b-button>
                 </template>
@@ -245,14 +245,30 @@ export default {
         },
         deleteZalovany: function (index) {
             this.zaloba.zalovani.splice(index, 1)
+        },
+        emitZaloba: function () {
+            if (this.newZalovan.jmeno !== "" && this.newZalovan.primeni !== "") {
+                this.addAnotherZalovany()
+            }
+            // TODO: proper validation
+            if (!this.hasZastoupeni) {
+                this.zaloba.zalobci[0].zastoupeni = null
+            }
+            console.log("a")
+            /* eslint-disable no-debugger */
+            //debugger
+            /* eslint-enable no-debugger */
+            this.$emit("zalobaguideclose",this.zaloba)
+            this.$parent.close()
         }
     },
     data: () => {
         return {
             continuedisabled: false,
-            activeStep: null,
+            activeStep: 0,
             hasNavigation: true,
             hasZastoupeni: false,
+            isFormValid: false,
             zaloba: {
                 soud: {
                         nazev: "",
@@ -289,7 +305,7 @@ export default {
                 }],
                 zalovani: [],
                 hlavy: [],
-                datum: "",
+                datum: new Date(),
                 cosleduje: "",
                 title: ""
             },
diff --git a/form/res-judicata/src/views/Edit.vue b/form/res-judicata/src/views/Edit.vue
index a0ec04d..e6232b7 100644
--- a/form/res-judicata/src/views/Edit.vue
+++ b/form/res-judicata/src/views/Edit.vue
@@ -50,7 +50,7 @@
       <div>
         <Hlava v-for="(hlava,index) in zaloba.hlavy" :key="index" v-bind:index="index" v-bind:title.sync="hlava.nazev" v-bind:text.sync="hlava.text" v-on:deletehlava="deleteHlava" />
       </div>
-      <b-button type="is-light" class="mt-3" v-on:click="addHlava" expanded>+</b-button>
+      <b-button type="is-success" class="mt-3" v-on:click="addHlava" expanded>+</b-button>
       <div class="columns mb-3">
         <div class="column is-two-quarter">
         </div>
@@ -106,12 +106,14 @@ export default {
   },
   created: function () {
     if (!this.modalOpen) {
+    var that = this
     this.$buefy.modal.open({
                     parent: this,
                     component: Guide,
                     hasModalCard: true,
                     trapFocus: true,
-                    canCancel: false
+                    canCancel: false,
+                    events: {"zalobaguideclose": function (zaloba) {that.zaloba = {...zaloba}}}
                 })
       this.modalOpen = true
     }
@@ -121,7 +123,46 @@ export default {
       pdfSrc: "",
       modalOpen: false,
       zalobaSetup: false,
-      zaloba: null
+      zaloba: {
+                soud: {
+                        nazev: "",
+                        sidlo: {
+                                uliceacislopopisne: "",
+                                mesto: "",
+                                psc: "",
+                                stat: ""
+                            }
+                    },
+                zalobci: [{
+                    rod: "",
+                    jmeno: "",
+                    prijmeni: "",
+                    sidlo: {
+                        uliceacislopopisne: "",
+                        mesto: "",
+                        psc: "",
+                        stat: ""
+                    },
+                    rodnecisloneboico: "",
+                    zastoupen: {
+                        rod: "",
+                        jmeno: "",
+                        prijmeni: "",
+                        sidlo: {
+                            uliceacislopopisne: "",
+                            mesto: "",
+                            psc: "",
+                            stat: ""
+                        },
+                        rodnecisloneboico: "" 
+                    }
+                }],
+                zalovani: [],
+                hlavy: [],
+                datum: "",
+                cosleduje: "",
+                title: ""
+            }
     }
   },
   methods: {