Simplify model, fix table alignment issues.