User interface with highlighter and bug fixes