changed colspans, removed containers for full page app