improvements to views here and there