Fixed file uploads, re-added Extract, UI tweaks