Fixed merge conflicts; cleaned up Main Activity