Various improvements to views