File permissions back
Merge branch 'dev'
Modified styling to all users view to list users down instead of looking like steps