cleaned up more row, containers and titles