Changed to better template (SPA)