Fixed bootstrap template issues