Added the click handlers, Highlight handler, Grid modifications.