better chart and layout