UI event flow fixes