Changed several things related to the Main Screen

Changed the Main Screen to go to the Calendar Screen and include a
Calendar button