Fixed font and banner image issues
Fixed merge conflicts