Add graphLayout extension point
Fix some semi-colon issues