fix bag
fix modal windov view
last changes
resolve merge conflicts
resolve merge conflicts