edit display
Merge pull request #234 from katiewood/master

edit display