Update AppModel
Update layout