Updated Core with Bootstrap