Add basic events, change highlighting - looks better now