Stylesheet and templates updates
Merging error fix