Fixing ui layout and behavior of delete popup