Fixed bad character issue and improved display