fixed few dropbox and label related bugs
code cleaning and few bugs fixes