Added group sorting
Fixed bindings