Refactor Models

DetailViews generated via ViewDescriptor