Toggles Fixed
merge Toggles Fix and List View Fixes