fixed some bugs and changed contact cell design