Updated design and created uploading functions