Removed rowspans and colspans

Fixes #181