fix some bug and add css