layout tweak and try catch around highlighting