add fixes and new wide template

add fixes and new wide template