Add custom font and fix logo
Merge Eric's changes