Improved layout.