God I hope this doesn't break our code...added layouts, updated onclick method, updated Android Manifest.