Refactored file uploads and added image upload wtf field