improve chart, change layout