organized more sections and removed unused selectors
updated canary version