Updated grid container--fixed generation and updated tables style