Fix add/remove items bugs, filepicker integration improved