Fixed issues with fonts disappearing. Other improvements