Added more modal stuff
Highlight and colors