Added modal view; pie chart switch;