Added Rectangle and Triangle clicks.