Move logic from utility tray