refactorization and adding a bootstrap theme