Remove hack so that colorbar custom labelling works.
Tweak colorbar layout for single row of plots.