modified tables to be bootstrap tables
fixed minor conflicts