bootstrap assets added & some bug fixed