Added selection handlers for the figures