rework button and form