restore touch logic
fix  sort buttons in NamesScreen