Added upload, fixed login