Tidied up the color map and plot ordering