Template fixes and addons