Rework the thumb keys