2D view repositioning, cleanups and formats.