Sepereated OWF Eventing logic and table/heat chart logic as per comments in the review.  This also allowed a one line imporvement to handle drill down when buttons are pressed on heat chart