change timeslots from array to map
remove Timeslot view as it gets replaced by gridview
Cleanup and renaming.