Refactored table grid view, fixes #14