removed nested container, put a wrapper instead. removed some unnecessary rows and cols