Improve the presentation and start work on index