add events; some UI changes