Improved image uploading and Users/avatar tools