Update design, add more information to the indexes and adjusted the spacing between fields