More work on the UI. The XML is no longer used but it's still here for reference.