Improved layout settings