added bootstrap, edit some parts