Normalize html structure according to latest bootstrap doc