Refactored Upcoming/Recent to Fragments