Some updates to @rodikal's Bootstrap implementation