Merge pull request #2 from jordandukart/7.x

Fixes.
Make the display logic smarter.