Refactor list name
Add list click to super class