Arrange things
fix special character