Events manage ui improvements