Beautified doc form, added remove option