Move view decorators here, jiggle some formatting