Bug 903401 - Fixing markup and CSS
More fixing
Merge pull request #11687 from lodr/bug-903401-buttons

 Bug 903401 - Fixing markup and CSS
r=arcturus