Improved description and layout