Added Icons, Added Toggling