Removed ad-hoc buttons from done step
Fixed button position
Fixed button logic