reorganised admin templates