Cleanup GridCollapse, add DisableSort mixin