changed wording
Moved display logic
resolved merge conflicts
Merge pull request #22 from ajstanley/7.x

Display logic