Make template follow last view changes