Edited with and index text
small layout changes