added model relationships, fixed display view