Main Activity modified