Improved layout design