Merge pull request #3 from jordandukart/7.x

Make the display logic smarter.
Map the keys correctly.