Move display-focused changes to rob-display.el