Added connecting screen and improved attachment uploading