Made some changes to the Main activity