Modified toggle behavior

Changed it to hopefully handle toggling quarter, selecting subject,
toggling quarter