FIX some style and add font