Cleaned up the popup class that was duplicated in the templates, added a RETURN_ON_UPLOAD setting to filebrowser which returns to the file listing after a successful upload