Updated bootstrap and templates