Removed unnecessary semicolon
Ensure graph nodes stay within container
Edge layout moved to datastructures (from tree) where it belongs; label positioning improvements