Improved district logic, better dates on dashboard