[IMP] Fixed alignment issue of existing template