Added custom choice boxes