changes to user_service views and settings
upload image view (temporary)
merge resolved