- Improved layout