Added more highlighting features. Looks pretty good now.