Fix bootstrap CSS bug (plus minor update)