Add: prepare document dialog starting to look good
Change: merge