Revert "Some tweaks to graph design"

This reverts commit 22f782ea9d39a650486ad6b84d7296521413c13d.