Fixing UI issues for mozilla