Restored import and style tweak for Mozilla