Added id for layout
Removed invalid setOnClickListener
Changed order of methods