Bug 20 follow up; UI rewrite/Step 2