fixed table names, window sizes
Merge pull request #24 from Deam/dev-david

fixed table names, window sizes