Fixed issues with font and extended row