a few template and layout changes