Refactored PreDay views