Make the display logic smarter.
Derp.
Merge pull request #3 from jordandukart/7.x

Make the display logic smarter.