Revises button event and selectors