added data info and improved layout