Some tweaks to graph design