Improve layout_setup
Update models