UI Tools update & refacto