Changes to MainActivity.java & activity_main.xml