Users pdf refactor
Merge branch 'users-refactor'