Rebranding and also fix a few issues seen in Firefox