UI/interaction fix