Improve graphing, rearrage css