Updates to UI, parsing fixes