Improved design and made upload real-time