refactored more templates to bootstrap 3