fix layout and syntax highlighting