Change template structure to separate admin and public templates instead of using macro