Fix #3
Update UI