Switched to loop only based on UID
Re-worked editing mode