[348][WD] fixed uml and code conventions
fixed merge conflict
modify admin view to use tables