added drag drop and labels