Changing to new bootstrap template and layout