Improve overlay performance and add title to context menu callback
Source formatting