Name and bootstrap class fix