Update templates and fix css errors