design updates
design updates: typography
resolved conflicts