Pie charts directive ( third draft - cleanup )
	- Some cleanup and toggle buttons bug fixes