Fix templates to push live, work on bug fixes in Streamlined