Commit No.6 Font and other changes