ticket:36 AcceptEventScreen; various improvements and cleanups