ana: new presentation model
some cleanup