Add fix for buttons in Firefox
Post-WIP changes