Attempt to make profile admin better