improve look for multiple data entry
fix grid with containers