Added 3 more button types