Expand/collapse working, sorting freezing
Add in collapse/sort example
Merged FileView changes