Added pagination/ minor view changes / added roles
Merge commit 'c5e5412e1bfca65a14fd88a99e17ac86c9b6073e'