merged with upstream and refactored some steps and the documents/show view