Fonts fix & cleanup
Font fix