Some minor refactoring, added ability to hide screenshot cell.