unify flare and flare elements ui