Improved layout and info