Changed structure of upload widget