Fixes and movinf map to modal