update bootstrap and minor changes in templates