integrate the rectangle shapes into the rendering

 # Changes to be committed:

Change-Id: I76f2597d3d92e65a3c9116a24f941896baeb5fb9