layout improvements on step2