Moved upload to popup