Better model management and layouts