refactor admin + update rebilling template