Fix new wizard UI