Undo my evil trick to crash the site.
Fix possible namespace collision, update view as grid.