Refactored code and added quickreturnlistview