Editing fields to use XML references, this is before code is deleted in initLayout.
First Test is still failing.