Issues #68 & #116 - Fix issue with the schedule on mobile

@mai @willykaram please review