Reorg and pull tap list page into app