Changed the shapes of the elements in the TikZ diagrams