Style nits. Highlights fixes + stylings