Further streamlining of views module