Layout agreements#show view
Fix merge conflict