Fixed templates and styles
Fixed templates and styles