Improved layout and content