Concluído

Reoganisation of some pages