New wizard design

Change-Id: I37b789c40ff4b1fb107c6dd2c57b39f6932b193b
Merge "New wizard design"