Update to MainActivity.java and xml