added shapes to layout