Streamlined view working much better