Api Change Done
MainActivity fixes