Update UI to behave properly