Fixed Highlighting Issues and Resized