Proper alignment of templete and changes in partial