Fix some spacing and chart aliasing