Fixed these following issues :
1. inconsistency on missmatch display
2. add swap button
3. consistency on first items, seems it never got refreshed