fix switcher and easy pie chart