moved settings to admin
updates to get display names and refactoring