Better behaved buttons

Ensure clickable areas for buttons match the visible buttons rather
than the entire block area of their parent elements; since the latter
behaviour is not indicated in the UI, it's a bit of a usability issue