changed model-class, minor layout changes