fix row and container order