Edited MainActivity