Crapload of changes around display.