Companion UI continued