Dropbox integration added + fixes