More work on XML based screens.