Working on bs-enhanced formatting