Move display to own file