Templates added, static html removed