fixing folder and document edit buttons, also looking at #2