Various fixes
Fixed dashboard sorting