Fixed bug with edge shapes
Added additional layout possibilities