Added the ability to switch shapes easily in the Shapes sample