Layout changes. Changed conversion of english abbr.