Refactor on UI injected bundle.

Reviewed by: Rafael Brandão