fix small layout and highlighting issues