Improved layout, content