Tidy up Display.Layout a bit