Improve hero button handling