Fix js and staff order