Fix button repaint on error (bug 840117)

Additionally poke the button z-index on error display and clearing of the error message.