Fix bootstrap modal issues