new ui design (not done); improved step handling