bs modal fix
merge bs modal fix