Cleaned up Main and ScheduleActivity