A few template and style changes.