Improved layout