Streamlined view now mostly working