Button Step and some other improvements