Small formatting and HTML enhancements