improved ui, fixed templating, fixed update event