Additional changes making use of issue #32 improvements
Fixed issue #39, decided #37 is a wontfix - not going to meddle in bootstrap theme for now