Added syntax highlighting and other UI improvements