Change ListView to RecyclerView
(refactor code)