template and style enhancements