Work on display code