Refactor Folder view