Refactor information overlay code
Restore highlighting