removed bootstrap with jquery
merged