Window resize async bug fixes, template organisation