fixed most issued caused by bootstrap integration