Refactored Year View, and imports organized automatically