More revision and some template modification started