change to new bootstrap version and little changes