Refactor / Adding ListView