Fix column panel, closes #832