1 finish most of table and modal ui