Fix event and screen clearing