R1:3da020b4931c

Scope remarkup highlighting better

Summary: These remarkup spans bleed into other areas, but afaik they only seem to be needed on the bright rule. Also normalized the height of the label, which changed when we changed button size.

Test Plan: Review many diffs and inline comments. If this rule altered something else I can't find, let me know?

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D12657