Enhancements based on HTML boilerplate