MainActivity edited