Started re-writing UI XML-parsing