diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 10cdab94..ae57c78a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -29,6 +29,7 @@ import { CipheringComponent } from './features/shared/components/ui/static-pages
 import { ErrorsListComponent } from './features/shared/components/ui/form/errors-list/errors-list.component';
 import { KeyboardShortcutsModule } from 'ng-keyboard-shortcuts';
 import { AdministrationModule } from './features/administration/administration.module';
+import { EditComponent } from './consultation/edit/edit.component';
 
 // register languages files for translation
 // import localeEn from '@angular/common/locales/en';
@@ -50,7 +51,7 @@ export function HttpLoaderFactory(http: HttpClient): TranslateHttpLoader {
 }
 
 @NgModule({
-	declarations: [AppComponent, CguComponent, LegalComponent, PrivacyComponent, CipheringComponent],
+	declarations: [AppComponent, CguComponent, LegalComponent, PrivacyComponent, CipheringComponent, EditComponent],
 	imports: [
 		AppRoutingModule,
 		AdministrationModule,
diff --git a/src/app/features/administration/administration.module.ts b/src/app/features/administration/administration.module.ts
index 6b6126dc..c843d545 100644
--- a/src/app/features/administration/administration.module.ts
+++ b/src/app/features/administration/administration.module.ts
@@ -81,6 +81,6 @@ import { DialogModule } from 'primeng/dialog';
 		ConfirmDialogModule,
 		DialogModule,
 	],
-	exports: [ActionsMenuComponent],
+	exports: [ActionsMenuComponent, StepperComponent, NavStepsComponent],
 })
 export class AdministrationModule {}
diff --git a/src/app/features/consultation/consultation-routing.module.ts b/src/app/features/consultation/consultation-routing.module.ts
index ed4d6798..16fdc3f9 100644
--- a/src/app/features/consultation/consultation-routing.module.ts
+++ b/src/app/features/consultation/consultation-routing.module.ts
@@ -8,6 +8,7 @@ import { ConsultationLandingComponent } from './consultation-landing/consultatio
 import { SuccessComponent } from './success/success.component';
 import { ConsultationUserComponent } from './consultation-user/consultation-user.component';
 import { PageNotFoundComponent } from '../../shared/components/page-not-found/page-not-found.component';
+import { EditComponent } from './edit/edit.component';
 
 const routes: Routes = [
 	{
@@ -19,6 +20,8 @@ const routes: Routes = [
 	{ path: 'prompt', component: PasswordPromptComponent },
 	{ path: 'table', component: WipTodoComponent },
 	{ path: 'user-info', component: ConsultationUserComponent },
+	{ path: 'vote', component: EditComponent },
+	{ path: 'edit/:voteStackId', component: EditComponent },
 	{ path: 'success', component: SuccessComponent },
 	{ path: 'page-not-found', component: PageNotFoundComponent },
 	{ path: '**', redirectTo: 'page-not-found', pathMatch: 'full' },
diff --git a/src/app/features/consultation/consultation-user/consultation-user.component.html b/src/app/features/consultation/consultation-user/consultation-user.component.html
index 701a91b8..1224a0f9 100644
--- a/src/app/features/consultation/consultation-user/consultation-user.component.html
+++ b/src/app/features/consultation/consultation-user/consultation-user.component.html
@@ -1,26 +1,30 @@
-<div class="user-infos">
-	<h2 class="title is-2">
-		Dites à l’organisateur et aux autres participants qui vous êtes !
-	</h2>
-	<label for="name">
-		Votre nom (obligatoire)
-	</label>
-	<input class="input" type="text" id="name" />
-	<label for="email">
-		Votre adresse e-mail (obligatoire)
-	</label>
-	<input class="input" type="text" id="email" />
+<app-stepper [step_current]="4" [step_max]="pollService.step_max"></app-stepper>
+<div class="step">
+	<div class="user-infos">
+		<h2 class="title is-2">
+			Dites à l’organisateur et aux autres participants qui vous êtes !
+		</h2>
+		<label for="name">
+			Votre nom (obligatoire)
+		</label>
+		<input class="input" type="text" id="name" />
+		<label for="email">
+			Votre adresse e-mail (obligatoire)
+		</label>
+		<input class="input" type="text" id="email" />
 
-	<div class="columns">
-		<div class="column">
-			<button class="button is-default" [routerLink]="['']">
-				Précédent
-			</button>
-		</div>
-		<div class="column">
-			<button class="button is-success" [routerLink]="['']">
-				Je participe
-			</button>
+		<div class="columns">
+			<div class="column">
+				<button class="button is-default" [routerLink]="['']">
+					Précédent
+				</button>
+			</div>
+			<div class="column">
+				<button class="button is-success" [routerLink]="['']">
+					Je participe
+				</button>
+			</div>
 		</div>
 	</div>
 </div>
+<app-nav-steps [next_step_number]="2" [previous_step_number]="0"></app-nav-steps>
diff --git a/src/app/features/consultation/consultation-user/consultation-user.component.ts b/src/app/features/consultation/consultation-user/consultation-user.component.ts
index 2b3f729d..002ab599 100644
--- a/src/app/features/consultation/consultation-user/consultation-user.component.ts
+++ b/src/app/features/consultation/consultation-user/consultation-user.component.ts
@@ -1,5 +1,10 @@
-import { Component, OnInit } from '@angular/core';
+import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
 import { PollService } from '../../../core/services/poll.service';
+import { DateUtilitiesService } from '../../../core/services/date.utilities.service';
+import { Router } from '@angular/router';
+import { ToastService } from '../../../core/services/toast.service';
+import { DOCUMENT } from '@angular/common';
+import { StorageService } from '../../../core/services/storage.service';
 
 @Component({
 	selector: 'app-consultation-user',
@@ -7,7 +12,17 @@ import { PollService } from '../../../core/services/poll.service';
 	styleUrls: ['./consultation-user.component.scss'],
 })
 export class ConsultationUserComponent implements OnInit {
-	constructor(public pollService: PollService) {}
+	constructor(
+		private dateUtilitiesService: DateUtilitiesService,
+		private router: Router,
+		private toastService: ToastService,
+		private cd: ChangeDetectorRef,
+		@Inject(DOCUMENT) private document: any,
+		private storageService: StorageService,
+		public pollService: PollService
+	) {
+		this.pollService.step_current = 4;
+	}
 
 	ngOnInit(): void {}
 }
diff --git a/src/app/features/consultation/consultation.module.ts b/src/app/features/consultation/consultation.module.ts
index 9c2d7450..8a5c44d3 100644
--- a/src/app/features/consultation/consultation.module.ts
+++ b/src/app/features/consultation/consultation.module.ts
@@ -15,6 +15,7 @@ import { ConsultationLandingComponent } from './consultation-landing/consultatio
 import { ConsultationUserComponent } from './consultation-user/consultation-user.component';
 import { SuccessComponent } from './success/success.component';
 import { AdministrationModule } from '../administration/administration.module';
+import { EditComponent } from './edit/edit.component';
 
 @NgModule({
 	declarations: [
@@ -26,6 +27,7 @@ import { AdministrationModule } from '../administration/administration.module';
 		ConsultationLandingComponent,
 		ConsultationUserComponent,
 		SuccessComponent,
+		EditComponent,
 	],
 	imports: [
 		CommonModule,
diff --git a/src/app/features/consultation/edit/edit.component.html b/src/app/features/consultation/edit/edit.component.html
new file mode 100644
index 00000000..436cb764
--- /dev/null
+++ b/src/app/features/consultation/edit/edit.component.html
@@ -0,0 +1,11 @@
+<app-stepper [step_current]="4" [step_max]="pollService.step_max"></app-stepper>
+<div class="step">
+	<h3 class="title is-3">
+		{{ 'participation.voting_title' | translate }}
+	</h3>
+	<div class="date-choices" *ngIf="pollService.poll.kind == 'date'">
+		<div class="box" *ngFor="let group of poll.choices_grouped"></div>
+	</div>
+	<div class="rounded-block"></div>
+</div>
+<app-nav-steps [next_step_number]="2" [previous_step_number]="0"></app-nav-steps>
diff --git a/src/app/features/consultation/edit/edit.component.scss b/src/app/features/consultation/edit/edit.component.scss
new file mode 100644
index 00000000..e69de29b
diff --git a/src/app/features/consultation/edit/edit.component.spec.ts b/src/app/features/consultation/edit/edit.component.spec.ts
new file mode 100644
index 00000000..4ad5595d
--- /dev/null
+++ b/src/app/features/consultation/edit/edit.component.spec.ts
@@ -0,0 +1,24 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { EditComponent } from './edit.component';
+
+describe('EditComponent', () => {
+	let component: EditComponent;
+	let fixture: ComponentFixture<EditComponent>;
+
+	beforeEach(async(() => {
+		TestBed.configureTestingModule({
+			declarations: [EditComponent],
+		}).compileComponents();
+	}));
+
+	beforeEach(() => {
+		fixture = TestBed.createComponent(EditComponent);
+		component = fixture.componentInstance;
+		fixture.detectChanges();
+	});
+
+	it('should create', () => {
+		expect(component).toBeTruthy();
+	});
+});
diff --git a/src/app/features/consultation/edit/edit.component.ts b/src/app/features/consultation/edit/edit.component.ts
new file mode 100644
index 00000000..c57883c3
--- /dev/null
+++ b/src/app/features/consultation/edit/edit.component.ts
@@ -0,0 +1,28 @@
+import { ChangeDetectorRef, Component, Inject, OnInit } from '@angular/core';
+import { DateUtilitiesService } from '../../../core/services/date.utilities.service';
+import { Router } from '@angular/router';
+import { ToastService } from '../../../core/services/toast.service';
+import { DOCUMENT } from '@angular/common';
+import { StorageService } from '../../../core/services/storage.service';
+import { PollService } from '../../../core/services/poll.service';
+
+@Component({
+	selector: 'app-edit',
+	templateUrl: './edit.component.html',
+	styleUrls: ['./edit.component.scss'],
+})
+export class EditComponent implements OnInit {
+	constructor(
+		private dateUtilitiesService: DateUtilitiesService,
+		private router: Router,
+		private toastService: ToastService,
+		private cd: ChangeDetectorRef,
+		@Inject(DOCUMENT) private document: any,
+		private storageService: StorageService,
+		public pollService: PollService
+	) {
+		this.pollService.step_current = 4;
+	}
+
+	ngOnInit(): void {}
+}
diff --git a/src/assets/i18n/EN.json b/src/assets/i18n/en.json
similarity index 100%
rename from src/assets/i18n/EN.json
rename to src/assets/i18n/en.json
diff --git a/src/assets/i18n/hu.json b/src/assets/i18n/hu.json
new file mode 100644
index 00000000..0db3279e
--- /dev/null
+++ b/src/assets/i18n/hu.json
@@ -0,0 +1,3 @@
+{
+
+}