Authentication/Schedule fixed
Merged MainActivity changes