New architecture working in Admin + bug fixes for notes