Update and simplify views