So many changes + more. (graphs and icons)