Layout changes SQL
Restore rendering of bridges
Merge pull request #968 from math1985/yaml-layout

Layout changes SQL