DEP-45 GUI improvements and XPath parsing