Make whole button clickable (#390, #391)