Attempt to fix merge conflict, adds drag'n'drop and auto filename