Merged version

Integrated everything except Filter Toggling