template and style fixes
template and style fixes