Fix an issue with dialog overflow and add heading to the governor