updated with Bootstrap components