More view cleanup and refinement