Removing unnecessary markup

Bootstrap demands rather heavy content markup, but some of it was not necessary.