Layout and code highlighting tweaks