Layout and code highlight corrections