Forking from #1124, neatening up view code and addressing @zr2d2 translation issue