Fix routing and dialogue edit screens