better buildhub wizard

Change-Id: If4038f1a96fd6df520db5c558b94a880af251cf3