refactor and document drawer-view