Added bootstrap + more table enhancement