Add joined colorbar, fix plotting