Focus fixes - no more col and row in focus ring