Add structured controller macro editing and safe replay