Modified static templates and changed some other files