Making the tables draggable
Fixing merge problems