Updated table mode switching