fix the play state handling and click actions