Adding more information and layout changes