Finished Daily Content refactoring