Refactord and added more data to paste and files view