diff --git a/src/app/config/PollConfig.ts b/src/app/config/PollConfig.ts
index 9c95b220..bd228ad5 100644
--- a/src/app/config/PollConfig.ts
+++ b/src/app/config/PollConfig.ts
@@ -48,6 +48,7 @@ export class PollConfig {
     password = '';
     customUrl = ''; // custom slug in the url, must be unique
     customUrlIsUnique = null; // given by the backend
+    urlSlugPublic = null;
     urlPublic = environment.baseHref + '/#/poll/id/3';
     urlAdmin = environment.baseHref + '/#/admin/d65es45fd45sdf45sd345f312sdf31sgfd345';
     canModifyAnswers = 1;// everybody, self, nobody (= just admin)
diff --git a/src/app/pages/answers/answers.component.html b/src/app/pages/answers/answers.component.html
index 78896640..5c81b5ae 100644
--- a/src/app/pages/answers/answers.component.html
+++ b/src/app/pages/answers/answers.component.html
@@ -94,6 +94,7 @@
     </button >
     <br >
     <a
+        [routerLink]="'/home'"
         class="prev"
         i18n >
         Retour
diff --git a/src/app/pages/end-confirmation/end-confirmation.component.html b/src/app/pages/end-confirmation/end-confirmation.component.html
index 550b48d9..ed76da26 100644
--- a/src/app/pages/end-confirmation/end-confirmation.component.html
+++ b/src/app/pages/end-confirmation/end-confirmation.component.html
@@ -22,7 +22,7 @@
         </a >
     </p >
     <button
-        class="btn"
+        class="btn btn--primary"
         (click)="copyLink(config.urlAdmin)"
         [ngxClipboard]
         cbContent="{{config.urlAdmin}}"
@@ -49,7 +49,7 @@
 
     </p >
     <button
-        class="btn"
+        class="btn btn--primary"
         (click)="copyLink(config.urlPublic)"
         [ngxClipboard]
         cbContent="{{config.urlPublic}}"
@@ -77,7 +77,7 @@
     </p >
 
     <button
-        class="btn"
+        class="btn btn--primary"
         (click)="sendToEmail()"
     ><i class="fa fa-paper-plane" ></i >
         Envoyer les liens du sondage
diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html
index 77b9dc71..7db295f3 100644
--- a/src/app/pages/home/home.component.html
+++ b/src/app/pages/home/home.component.html
@@ -18,12 +18,16 @@
         [(ngModel)]="config.pollType"
         autofocus="autofocus"
         id="selector"
-        name="selector"
+        name='polltype'
     >
-        <option value="dates" >
+        <option
+            value="dates"
+            name='polltype_date' >
             {{"creation.kind.date"|translate}}
         </option >
-        <option value="classic" >
+        <option
+            value="classic"
+            name='polltype_classic' >
             {{"creation.kind.classic"|translate}}
         </option >
     </select >
@@ -101,12 +105,23 @@
     <button
         [routerLink]="'/step/answers'"
         class="btn btn--primary btn--full"
+        *ngIf="config.pollType == 'classic'"
         i18n
     >
         Continuer
+        <i class='fa fa-file-text' ></i >
+    </button >
+    <button
+        [routerLink]="'/step/date'"
+        class="btn btn--primary btn--full"
+        *ngIf="config.pollType == 'dates'"
+        i18n
+    >
+        Continuer
+        <i class='fa fa-calendar-check-o' ></i >
     </button >
     <a
-        [routerLink]="'/step/answers'"
+        [routerLink]="'/step/creation'"
         class="prev"
         i18n
     >
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
index 2397d5f5..a605b44b 100644
--- a/src/app/pages/home/home.component.ts
+++ b/src/app/pages/home/home.component.ts
@@ -9,6 +9,7 @@ import {BaseComponent} from "../base-page/base.component";
 })
 export class HomeComponent extends BaseComponent implements OnInit {
 
+    nextStep = '/step/answers';
     constructor(public config: ConfigService) {
         super(config);
     }
diff --git a/src/app/pages/poll-display/poll-display.component.html b/src/app/pages/poll-display/poll-display.component.html
index 896fda4e..15c2c26b 100644
--- a/src/app/pages/poll-display/poll-display.component.html
+++ b/src/app/pages/poll-display/poll-display.component.html
@@ -74,7 +74,7 @@
         <framadate-vote-choice
             [choice]="choice"
             [pollIsSpecialDate]="config.currentPoll.data.kind == 'date'"
-            [simpleAnswer]="config.currentPoll.data.allowedAnswers.length == 1 " ></framadate-vote-choice >
+            [poll]='config.currentPoll' ></framadate-vote-choice >
     </div >
 </div >
 <button
diff --git a/src/app/services/config.service.ts b/src/app/services/config.service.ts
index d419bbdb..58ce01d8 100644
--- a/src/app/services/config.service.ts
+++ b/src/app/services/config.service.ts
@@ -295,6 +295,12 @@ export class ConfigService extends PollConfig {
                     this.currentPoll = res.data;
                     this.currentPoll.admin_key = res.admin_key;
                     this.pollId = res.data.id;
+                    this.urlPublic = this.baseHref + '#/vote/poll/id/' + res.data.id;
+                    this.urlSlugPublic = this.baseHref + '#/vote/poll/slug/' + res.data.id;
+                    if (res.data.customUrl) {
+                        this.urlSlugPublic = this.baseHref + '#/vote/poll/id/' + res.data.customUrl;
+                    }
+                    this.urlAdmin = this.baseHref + '#/admin/' + res.admin_key;
                     this.loading = false;
                     if (!this.myPolls) {
                         this.myPolls = [];
diff --git a/src/app/ui/vote-choice/vote-choice.component.ts b/src/app/ui/vote-choice/vote-choice.component.ts
index 8397bf8e..cc24bfc1 100644
--- a/src/app/ui/vote-choice/vote-choice.component.ts
+++ b/src/app/ui/vote-choice/vote-choice.component.ts
@@ -27,12 +27,15 @@ export class VoteChoiceComponent {
 
     public showChangeChoicebutton = false;
     @Input() public choice: any;
+    @Input() public poll: any;
     @Input() public simpleAnswer: boolean = true;
     @Input() public pollIsSpecialDate: boolean = false;
 
     constructor(private el: ElementRef) {
 
-        console.log('choice', this.choice)
+        if (this.poll && this.poll.data && this.poll.data.allowedAnswers) {
+            this.simpleAnswer = this.poll.data.allowedAnswers.length == 1
+        }
     }
 
     setAnswserTo(newAnswer: 'yes' | 'no' | 'maybe' | null) {