Filter out draw events, improve UI