Button handling was wrong