added bootstrap
remove button works
fixed merge errors