Can we get rid of these ugly hacks while we're here and turn such clickable spans into real button type="button" elements?