Changes for table key navigation