Fixed Bootstrap Issues

@ahmadsoliman Fixed Bootstrap issues. Check again then merge!