Reorganize and add highlighting