Small refactoring of UI packages