improve(model/view): updates layout