Android: Dynamic Layout - Implemented OnClickListener and added some untracked changes