bootstrap theme, plus some reorganization