focus was removed, other changes on template mostly