added rows and fixed proper containers