Make this code more uniform
Add bootstrap