Improved layout and models