Refactor: Label editing now works