Merge "Rework Loop properties window"