fix multi drop and add alignment