Updating the Schedule

Bit of refactoring done to the code. Still needs styling!