Reworked everything for Firefox