Finally fix the last CPU chart bug
Various cleanups
Layout improvments