Refactor the looks of listing screen. #13