Refactored resources, added user settings for admin