Add tags, UI enchancments.