ticket:1 templates and CSS updated