lot of changes for the sheriff panel