Editor and Dialog Overhaul