revamp steps, allow finish button