Refactored display

- display function exracted from dispatcher