Few modifications about design and presentation