More tweaks on the controller appearance and selection handles behaviour