template & css enhancements