Changed MainActivity and Adapter