More tweaks on the plots