Updated form to add circle and triangle input