Perfomance and view improvements