More highlighting tests, some layout changes