Update UI closes #8