More work on UI, added event types