Will/ui improvements