Updated Main Activity