Finish moving all ui package to sensible logging