template widget fix

General Bug Fixes