Misc Changes to bootstrap template files