Move most metadata into notes
Refine views