view improvements + performance optimization