Refactoring , admin area with date filters