moved data to static and fixed templates