Updated Main
Cleaned up Main and ScheduleActivity