Refactor Thumb Buttons