Bootstrapv3

Changes are made only to styling, I see no conflicts with the merge