Fixed combining layout/highlighting