fix several template and design issues