Simplify graph units management
Update UI logos